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

[mhay]

The following commit has been merged in the debian/unstable branch:
commit dc142a10ee891355518a9f277f171e6e08b59534
Author: mhay <mhay at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 13 05:19:20 2003 +0000

    	First cut at importing Netscape and Mozilla bookmarks.
    
    	Reviewed by Darin Adler, John Sullivan
    
    	* BookmarksController.h:
    	Removed -(IBAction)importInternetExplorerFavorites:(id)sender;
    	and replaced it with -(IBAction)importFavorites:(id)sender;
    
    	* BookmarksController.m:
    	(-[BookmarksController importFavoritesFrom:intoBookmarksFolder:settingPrefKey:]):
    	(-[BookmarksController importIEFavorites]):
    	(-[BookmarksController _computeNetscapeAndMozillaBookmarksPath]):
    	(-[BookmarksController importNetscapeAndMozillaFavorites]):
    	(-[BookmarksController importFavorites:]):
    	(-[BookmarksController importFavoritesIfNecessary]):
    	(-[BookmarksController awakeFromNib]):
    	Rearranged/rewrote bookmark importing code to support multiple
    	browser types.
    
    	* PreferenceKeys.h:
    	Added preference key to indicate that we had imported Netscape
    	and Mozilla bookmarks.
    
    	* Localizable.strings:
    	Added localizable string used to name imported Netscape
            and Mozilla bookmarks folder.
    
    	* DebugUtilities.m:
    	(-[DebugUtilities createDebugMenu]):
    	Changed menu item "Import IE Favorites" to "Import Favorites".
    	Changed action associated with that menu item from
    	importInternetExplorerFavorites: to importFavorites:
    
    	* WebBookmarkImporter.h:
    	Defined constant strings used to import Netscape and Mozilla
    	bookmarks.
    
    	* WebBookmarkImporter.m:
    	(-[WebBookmarkImporter initWithPath:]):
    	Added return statement to avoid executing when we had no data.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkImporter.h b/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
index 7d42f02..c236889 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkImporter.h
@@ -14,6 +14,15 @@
 #define InternetExplorerBookmarksPath \
     ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Preferences/Explorer/Favorites.html"])
 
+#define NetscapeAndMozillaDefaultProfilePath \
+    ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Mozilla/Profiles/default"])
+
+#define NetscapeAndMozillaRandomDirExt \
+    (@".slt")
+
+#define NetscapeAndMozillaBookmarkFileName \
+    (@"bookmarks.html")
+    
 @interface WebBookmarkImporter : NSObject 
 {
     WebBookmark *topBookmark;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
index c8d7a6b..f0cf3ec 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
@@ -175,7 +175,7 @@ static NSString *_linkTextFromSpec(NSString *spec)
 
 @implementation WebBookmarkImporter
 
--(id)initWithPath:(NSString *)path
+- (id)initWithPath:(NSString *)path
 {
     self = [super init];
     if (!self) {
@@ -185,6 +185,7 @@ static NSString *_linkTextFromSpec(NSString *spec)
     NSData *data = [[NSData alloc] initWithContentsOfFile:path];
     if (!data) {
         error = [[WebError alloc] initWithErrorCode:WebKitErrorCannotOpenFile inDomain:WebErrorDomainWebKit failingURL:path];
+        return self;
     }
 
     NSString *string = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];

-- 
WebKit Debian packaging