[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 d027af449220efdeb8270e47e41f25dd9cb44620
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 7 01:10:10 2002 +0000

    WebKit:
    
            * Bookmarks.subproj/WebBookmark.m:
            (+[WebBookmark bookmarkOfType:]):
    	made this handle WebBookmarkTypeProxy
    
    WebBrowser:
    
    	- fixed 3092708 -- allow option for Bookmarks Toolbar as submenu of Bookmarks menu
    
    	The wording and possibly layout in Preferences will change soon, but the
    	behavior is now implemented as SJ specified.
    
            * Defaults.plist:
            * PreferenceKeys.h:
    	New preference keys for the new options
    
            * Preferences.subproj/English.lproj/BookmarkPreferences.nib:
    	rejigger everything in the bookmarks preferences panel
    
            * Preferences.subproj/BookmarkPreferences.h:
            * Preferences.subproj/BookmarkPreferences.m:
            (-[BookmarkPreferences updateBookmarksViews]):
            (-[BookmarkPreferences toggleBookmarksToolbarIncludesAddressBook:]):
            (-[BookmarkPreferences toggleBookmarksToolbarIncludesRendezvous:]):
            (-[BookmarkPreferences toggleBookmarksMenuAndToolbarAreSame:]):
            (-[BookmarkPreferences toggleBookmarksMenuIncludesBookmarksToolbar:]):
            (-[BookmarkPreferences toggleBookmarksMenuIncludesRendezvous:]):
            (-[BookmarkPreferences initializeFromDefaults]):
    	reworked all the code to handle the new options, including the way
    	some options change when others are checked
    
            * BookmarksController.h:
    	made addressBookProxyTitle and rendezvousProxyTitle public
            * BookmarksController.m:
            (-[BookmarksController addChildrenOfBookmark:toMenu:]):
    	new method, generalized from code elsewhere (handles keyboard equivalents
    	for toolbar items)
            (-[BookmarksController addMenuItemForBookmark:toMenu:]):
    	now calls addChildrenOfBookmark:toMenu:
            (-[BookmarksController addFavoritesSubmenu]):
    	new method, calls addChildrenOfBookmark:toMenu:
            (-[BookmarksController addSpecialBookmarkSourcesToMenu]):
    	now handles toolbar as submenu, plus fancier logic to match new preferences
            (-[BookmarksController _addBookmarksToMenu]):
    	now calls addChildrenOfBookmark:toMenu:
            (-[BookmarksController receivedBrowserPreferenceValueChangedNotification:]):
    	now checks for new preferences also
    
            * FavoriteButton.m:
            (-[FavoriteButton setBookmark:]):
    	now handles WebBookmarkTypeProxy -- like folder in appearance, but not a
    	drag target
            (-[FavoriteButton menu]):
    	now handles WebBookmarkTypeProxy (by returning nil for the context menu)
            (-[FavoriteButton hasContentsMenu]):
    	new method, just checks bookmark type
            (-[FavoriteButton _contentsMenu]):
    	now handles WebBookmarkTypeProxy by using BookmarkSource protocol to
    	extract contents
            (-[FavoriteButton mouseDown:]):
    	check hasContentMenu instead of assuming which types have menus
    
            * FavoritesBar.m:
            (-[FavoritesBar addButtonForBookmark:withLeftEdge:]):
    	new method, extracted from _refreshButtons
            (-[FavoritesBar includeRendezvous]),
            (-[FavoritesBar includeAddressBook]):
    	new methods, check with NSUserDefaults
            (-[FavoritesBar _refreshButtons]):
    	take includeRendezvous and includeAddressBook into account; now
    	calls addButtonForBookmark:withLeftEdge:
            (-[FavoritesBar refreshButtonsSoon]):
    	new method, extracted from _favoritesChanged
            (-[FavoritesBar preferenceValueChanged:]):
    	new method, call refreshButtons if the right prefs have changed
            (-[FavoritesBar _favoritesChanged:]):
    	now calls refreshButtonsSoon
            (-[FavoritesBar initWithView:]):
    	register for preferences value changed notifications
            (-[FavoritesBar dropIndexFromDraggingInfo:]):
    	take includeRendezvous and includeAddressBook into account
            (-[FavoritesBar performDragOperation:]):
    	take includeRendezvous and includeAddressBook into account
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index c1c22e1..c396143 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -141,6 +141,8 @@
         return [[[WebBookmarkList alloc] init] autorelease];
     } else if (type == WebBookmarkTypeLeaf) {
         return [[[WebBookmarkLeaf alloc] init] autorelease];
+    } else if (type == WebBookmarkTypeProxy) {
+        return [[[WebBookmarkProxy alloc] init] autorelease];
     }
 
     return nil;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 67ab37b..ed6237c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-06  John Sullivan  <sullivan at apple.com>
+
+        * Bookmarks.subproj/WebBookmark.m:
+        (+[WebBookmark bookmarkOfType:]):
+	made this handle WebBookmarkTypeProxy
+
 2002-11-06  Darin Adler  <darin at apple.com>
 
 	- fixed bug that affected BinHex-encoded files with no resource fork
@@ -25,6 +31,7 @@
 
 2002-11-06  Darin Adler  <darin at apple.com>
 
+>>>>>>> 1.1102
 	- added a BinHex decoder and did a little work on the MacBinary decoder
         
         I'm not supposed to be working on this, but I didn't feel like doing "real" work.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 67ab37b..ed6237c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-11-06  John Sullivan  <sullivan at apple.com>
+
+        * Bookmarks.subproj/WebBookmark.m:
+        (+[WebBookmark bookmarkOfType:]):
+	made this handle WebBookmarkTypeProxy
+
 2002-11-06  Darin Adler  <darin at apple.com>
 
 	- fixed bug that affected BinHex-encoded files with no resource fork
@@ -25,6 +31,7 @@
 
 2002-11-06  Darin Adler  <darin at apple.com>
 
+>>>>>>> 1.1102
 	- added a BinHex decoder and did a little work on the MacBinary decoder
         
         I'm not supposed to be working on this, but I didn't feel like doing "real" work.

-- 
WebKit Debian packaging