[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 fc1a86079380bd12e2fc049ca347935e3a26af3e
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 15 17:01:33 2002 +0000

    WebKit:
    
    	Disabled support for storing favIcon URLs in bookmarks; Gramps realized
    	this is an architecture problem that needs a better solution, and he
    	didn't want to ship Alex-18 with this problem.
    
            * Bookmarks.subproj/WebBookmarkLeaf.m:
            (-[WebBookmarkLeaf dictionaryRepresentation]):
            * History.subproj/WebHistoryItem.m:
            (-[WebHistoryItem dictionaryRepresentation]):
    	Commented out the code that added the iconURLString in the dictionary used
    	for writing out file. This dictionary is also used on the pasteboard, so this
    	change causes the favIcon not to be remembered when you drag from proxy icon
    	to favorites bar.
    
    WebBrowser:
    
    	Fixed some of the brokenness with favIcons caused by yesterday's
    	favIcon checkin. I'm going to change the API for the bookmark
    	sheet to make this cleaner, but this is the quick fix so that
    	Alex-18 won't be too broken.
    
            * BookmarksController.h:
            * BookmarksController.m:
            (-[BookmarksController displayNewBookmarksSheetForURLs:titles:iconURLStrings:inWindow:]):
    	Change iconURLs parameter to iconURLStrings so there's an easy way to represent nil URLs
    	(with empty strings).
    
            (-[BookmarksController _newBookmarkSheetDidEnd:returnCode:contextInfo:]): Convert from URL
    	strings back to URLs for the purpose of creating bookmarks.
    
            * BrowserDocument.m:
            (-[BrowserDocument _mainDataSourceHasChanged]): Set the iconURL to nil here. Formerly it
    	was only set when the incoming page specified one, which meant that future pages that
    	don't specify an iconURL (favIcon) would use the leftover one for some purposes, like
    	when creating a new bookmark.
    
            (-[BrowserDocument addBookmark:]): Pass non-nil iconURLStrings even when iconURL is nil,
    	since the API demands three parallel arrays.
    
            * ContextMenuHandler.m:
            (-[ContextMenuHandler addLinkToBookmarks:]): Pass an array of strings instead of URLs
    	for the titles (did this ever work?); pass non-nil iconURLStrings even when iconURL is
    	nil, since the API demands three parallel arrays.
    
            * GlobalHistory.m:
            (-[GlobalHistory addSelectedItemsToBookmarks:]): pass always non-nil iconURLStrings instead
    	of adding sometimes-nil iconURLs to array; this would have failed in any case where the
    	favIcon was nil.
    
            * NewBookmarksController.h:
            * NewBookmarksController.m:
            (-[NewBookmarksController initWithURLs:titles:iconURLStrings:]):
    	Change array from URLs to strings, assert that iconURLStrings is same length as
    	other two arrays.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1829 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index e16122d..0ccf64d 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -78,11 +78,15 @@
     if (_URLString != nil) {
         [dict setObject:_URLString forKey:URLStringKey];
     }
-    
+
+#if 0
+// FIXME 8/15/2002 -- temporarily removing support for storing iconURL (favIcon), due to architecture issues
     NSURL *iconURL = [_entry iconURL];
     if(iconURL) {
         [dict setObject:[iconURL absoluteString] forKey:IconURLStringKey];
     }
+#endif
+    
     return dict;
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9902e45..48bef10 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-15  John Sullivan  <sullivan at apple.com>
+
+	Disabled support for storing favIcon URLs in bookmarks; Gramps realized
+	this is an architecture problem that needs a better solution, and he
+	didn't want to ship Alex-18 with this problem.
+
+        * Bookmarks.subproj/WebBookmarkLeaf.m:
+        (-[WebBookmarkLeaf dictionaryRepresentation]):
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem dictionaryRepresentation]):
+	Commented out the code that added the iconURLString in the dictionary used
+	for writing out file. This dictionary is also used on the pasteboard, so this
+	change causes the favIcon not to be remembered when you drag from proxy icon
+	to favorites bar.
+
 === Alexander-18 ===
 
 2002-08-14  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9902e45..48bef10 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-08-15  John Sullivan  <sullivan at apple.com>
+
+	Disabled support for storing favIcon URLs in bookmarks; Gramps realized
+	this is an architecture problem that needs a better solution, and he
+	didn't want to ship Alex-18 with this problem.
+
+        * Bookmarks.subproj/WebBookmarkLeaf.m:
+        (-[WebBookmarkLeaf dictionaryRepresentation]):
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem dictionaryRepresentation]):
+	Commented out the code that added the iconURLString in the dictionary used
+	for writing out file. This dictionary is also used on the pasteboard, so this
+	change causes the favIcon not to be remembered when you drag from proxy icon
+	to favorites bar.
+
 === Alexander-18 ===
 
 2002-08-14  Chris Blumenberg  <cblu at apple.com>
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index fc37991..0236abc 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -229,9 +229,12 @@
         [dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
                  forKey: @"lastVisitedDate"];
     }
+#if 0
+// FIXME 8/15/2002 -- temporarily removing support for storing iconURL (favIcon), due to architecture issues
     if (_iconURL != nil) {
         [dict setObject: [_iconURL absoluteString] forKey: @"iconURL"];
     }
+#endif
 
     return dict;
 }

-- 
WebKit Debian packaging