[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 4e31aef1b92c139f0129a88ebdc6f7d3e9bd22fd
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 10 23:02:08 2002 +0000

    WebKit:
    
    	- tweaked the API of WebBookmarkImporter while implementing
    	real "Import IE Favorites" UI
    
            Reviewed by Ken
    
            * Bookmarks.subproj/WebBookmarkImporter.h:
    	fixed a typo in a constant
            * Bookmarks.subproj/WebBookmarkImporter.m:
            (-[WebBookmarkImporter initWithPath:]):
    	Don't pass a group here. This method now creates the topBookmark
    	(as it was doing before) but does not attempt to insert it
    	anywhere. It's up to the client to fetch the topBookmark and do
    	something with it. Also, don't name the new folder here; leave
    	that to the caller also.
    
            * English.lproj/Localizable.strings:
    	kept this file up to date
    
    WebBrowser:
    
    	- fixed 3123342 -- Import IE bookmarks at first startup
    	- fixed 3122497 -- Descenders cut off in bookmarks view
    	- removed "Google Search" from View menu since it's not
    	working yet and we're hoping to get by without it using
    	a direct manipulation approach instead
    
            Reviewed by Ken
    
            * BookmarksController.m:
            (-[BookmarksController importInternetExplorerFavorites]):
    	new method, moved here from DebugUtilities and tweaked to match
    	changes in WebBookmarkImporter's API
            (-[BookmarksController importInternetExplorerFavoritesIfNecessary]):
    	new method, checks NSUserDefaults value to bail out if importing has already
    	occurred, and sets NSUserDefaults value after importing.
            (-[BookmarksController awakeFromNib]):
    	call importInternetExplorerFavoritesIfNecessary
    
            * Debug/DebugUtilities.m:
            (-[DebugUtilities createDebugMenu]):
    	remove IE importing stuff from here
    
            * English.lproj/Localizable.strings:
    	kept this file up to date
    
            * English.lproj/MainMenu.nib:
    	removed "Google Search" menu item from View menu
    
            * PreferenceKeys.h:
    	added preference key to remember whether we've imported
    	IE favorites
    
            * TextCell.m:
            (-[TextCell drawInteriorWithFrame:inView:]):
    	Rather than insetting frame to make text appear vertically
    	centered, just move down the top edge. This fixes 3122497.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkImporter.h b/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
index 078946e..7d42f02 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
@@ -10,9 +10,8 @@
 
 @class WebError;
 @class WebBookmark;
- at class WebBookmarkGroup;
 
-#define InteretExplorerBookmarksPath \
+#define InternetExplorerBookmarksPath \
     ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Preferences/Explorer/Favorites.html"])
 
 @interface WebBookmarkImporter : NSObject 
@@ -21,7 +20,7 @@
     WebError *error;
 }
 
--(id)initWithPath:(NSString *)path group:(WebBookmarkGroup *)group;
+-(id)initWithPath:(NSString *)path;
 -(WebBookmark *)topBookmark;
 -(WebError *)error;
 
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
index bee7c25..8f3b1f0 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
@@ -12,7 +12,6 @@
 #import <WebFoundation/WebLocalizableStrings.h>
 #import <WebKit/WebBookmark.h>
 #import <WebKit/WebBookmarkPrivate.h>
-#import <WebKit/WebBookmarkGroup.h>
 #import <WebKit/WebKitErrors.h>
 
 static NSMutableArray *_breakStringIntoLines(NSString *string)
@@ -192,7 +191,7 @@ static NSString *_linkTextFromSpec(NSString *spec)
 
 @implementation WebBookmarkImporter
 
--(id)initWithPath:(NSString *)path group:(WebBookmarkGroup *)group
+-(id)initWithPath:(NSString *)path
 {
     self = [super init];
     if (!self) {
@@ -216,8 +215,6 @@ static NSString *_linkTextFromSpec(NSString *spec)
     
     // create the top-level folder
     topBookmark = [[WebBookmark bookmarkOfType:WebBookmarkTypeList] retain];
-    [topBookmark setTitle:UI_STRING("Imported IE Favorites", "Imported IE Favorites menu item")];
-    [topBookmark _setGroup:group];
     [bookmarkLists addObject:topBookmark];
     
     for (i = 0; i < lineCount; i++) {
@@ -271,10 +268,6 @@ static NSString *_linkTextFromSpec(NSString *spec)
             // ignore this line
         }
     }
-
-    bookmark = [group topBookmark];
-    numberOfChildren = [bookmark numberOfChildren];
-    [bookmark insertChild:topBookmark atIndex:numberOfChildren];
     
     return self;
 }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 238b49a..671d4c9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-12-10  John Sullivan  <sullivan at apple.com>
+
+	- tweaked the API of WebBookmarkImporter while implementing
+	real "Import IE Favorites" UI
+
+        Reviewed by Ken
+
+        * Bookmarks.subproj/WebBookmarkImporter.h:
+	fixed a typo in a constant
+        * Bookmarks.subproj/WebBookmarkImporter.m:
+        (-[WebBookmarkImporter initWithPath:]):
+	Don't pass a group here. This method now creates the topBookmark
+	(as it was doing before) but does not attempt to insert it
+	anywhere. It's up to the client to fetch the topBookmark and do
+	something with it. Also, don't name the new folder here; leave
+	that to the caller also.
+
+        * English.lproj/Localizable.strings:
+	kept this file up to date
+
 2002-12-10  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index a8daacc..98c3b53 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ

-- 
WebKit Debian packaging