[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 724596a0c289f12884de0edf27802d22a2295bba
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 15 23:14:42 2002 +0000

    WebKit:
    
    	- fixed 3025770 -- "New Bookmark" button hits assertion and crashes
    
            * Bookmarks.subproj/WebBookmarkLeaf.m:
            (-[WebBookmarkLeaf setURLString:]): Instead of asserting that parameter
    	is not nil, handle the nil case by converting to empty string. This was
    	another regression from yesterday's favIcon changes.
    
    WebBrowser:
    
    	- fixed remaining case in 3015942 -- Using Bookmarks New Separator button causes
    	loss of keyboard focus
    	- fixed 3023789 -- Find dialog should hide on deactivate to match Mail/TextEdit
    
            * BookmarksController.m:
            (-[BookmarksController _focusOnNewlyCreatedBookmark:]): Make outline view
    	first responder here.
    
            * OutlineViewPlus.m:
            (-[OutlineViewPlus textDidEndEditing:]): restructured a little.
    
    	* English.pbproj/Find.nib: checked "Hide on deactivate" checkbox;
    	actually I checked this in accidentally with my previous checkin, so
    	this comment is late.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index 0ccf64d..7792762 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -150,7 +150,10 @@
 
 - (void)setURLString:(NSString *)URLString
 {
-    WEBKIT_ASSERT_VALID_ARG (URLString, URLString != nil);
+    if (URLString == nil) {
+        URLString = @"";
+    }
+    
     if ([URLString isEqualToString:_URLString]) {
         return;
     }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4e28440..1eb20ae 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-15  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3025770 -- "New Bookmark" button hits assertion and crashes
+
+        * Bookmarks.subproj/WebBookmarkLeaf.m:
+        (-[WebBookmarkLeaf setURLString:]): Instead of asserting that parameter
+	is not nil, handle the nil case by converting to empty string. This was
+	another regression from yesterday's favIcon changes.
+
 === Alexander-19 ===
 
 2002-08-15  John Sullivan  <sullivan at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4e28440..1eb20ae 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-15  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3025770 -- "New Bookmark" button hits assertion and crashes
+
+        * Bookmarks.subproj/WebBookmarkLeaf.m:
+        (-[WebBookmarkLeaf setURLString:]): Instead of asserting that parameter
+	is not nil, handle the nil case by converting to empty string. This was
+	another regression from yesterday's favIcon changes.
+
 === Alexander-19 ===
 
 2002-08-15  John Sullivan  <sullivan at apple.com>

-- 
WebKit Debian packaging