[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 e91a4b9d4a19e51deb1875e5509cca13012d751d
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 28 17:26:35 2003 +0000

    	- fixed 3158304 -- Assertion failure cancelling "Add Bookmark"
    	or deleting newly-created bookmarks
    
            Reviewed by Darin
    
            * Bookmarks.subproj/WebBookmarkGroup.m:
            (-[WebBookmarkGroup _bookmark:changedUUIDFrom:to:]):
    	new method that notifies group when a bookmark that's already
    	in a group changes its UUID -- the UUID to bookmark dictionary
    	updates for this change.
    
            * Bookmarks.subproj/WebBookmarkGroupPrivate.h:
    	private declaration for this method
    
            * Bookmarks.subproj/WebBookmark.m:
            (-[WebBookmark _setUUID:]):
    	notify group when UUID changes
            (-[WebBookmark UUID]):
    	ditto
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index f25791c..d0117a0 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -148,8 +148,11 @@
 {
     ASSERT(_UUID == nil || UUID == nil);
 
-    [_UUID release];
+    NSString *oldUUID = _UUID;
     _UUID = [UUID copy];
+
+    [[self group] _bookmark:self changedUUIDFrom:oldUUID to:_UUID];
+    [oldUUID release];
 }
 
 - (NSString *)UUID
@@ -158,6 +161,7 @@
     if (_UUID == nil) {
         CFUUIDRef UUIDRef = CFUUIDCreate(kCFAllocatorDefault);
         _UUID = (NSString *)CFUUIDCreateString(kCFAllocatorDefault, UUIDRef);
+        [[self group] _bookmark:self changedUUIDFrom:nil to:_UUID];
         CFRelease(UUIDRef);
     }
     
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index b78fca2..ba06760 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -92,6 +92,19 @@ NSString *TagKey = @"WebBookmarkGroupTag";
     }
 }
 
+- (void)_bookmark:(WebBookmark *)bookmark changedUUIDFrom:(NSString *)oldUUID to:(NSString *)newUUID
+{
+    ASSERT([bookmark group] == self);
+
+    if (oldUUID != nil) {
+        [_bookmarksByUUID removeObjectForKey:oldUUID];
+    }
+
+    if (newUUID != nil) {
+        [_bookmarksByUUID setObject:bookmark forKey:newUUID];
+    }
+}
+
 - (void)_removeBookmark:(WebBookmark *)bookmark
 {
     ASSERT([bookmark group] == self);
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
index 28b4074..157f361 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroupPrivate.h
@@ -18,6 +18,7 @@
 
 - (void)_addBookmark:(WebBookmark *)bookmark;
 - (void)_removeBookmark:(WebBookmark *)bookmark;
+- (void)_bookmark:(WebBookmark *)bookmark changedUUIDFrom:(NSString *)oldUUID to:(NSString *)newUUID;
 
 @end
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index af14644..1eabfba 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,25 @@
+2003-01-28  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3158304 -- Assertion failure cancelling "Add Bookmark"
+	or deleting newly-created bookmarks
+
+        Reviewed by Darin
+
+        * Bookmarks.subproj/WebBookmarkGroup.m:
+        (-[WebBookmarkGroup _bookmark:changedUUIDFrom:to:]):
+	new method that notifies group when a bookmark that's already
+	in a group changes its UUID -- the UUID to bookmark dictionary
+	updates for this change.
+
+        * Bookmarks.subproj/WebBookmarkGroupPrivate.h:
+	private declaration for this method
+
+        * Bookmarks.subproj/WebBookmark.m:
+        (-[WebBookmark _setUUID:]):
+	notify group when UUID changes
+        (-[WebBookmark UUID]):
+	ditto
+
 2003-01-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.

-- 
WebKit Debian packaging