[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 4e8d846d59467bc1d92add002f0749c52fd33c40
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 11 17:43:26 2002 +0000

    WebKit:
    
    	- fixed 3124640 -- Crash importing IE Favorites if there
    	are no IE favorites
    
            Reviewed by Darin
    
            * Bookmarks.subproj/WebBookmarkImporter.m:
            (-[WebBookmarkImporter initWithPath:]):
    	use alloc/init instead of autoreleasing constructor for error since
    	it's kept around until dealloc.
    
    WebBrowser:
    
    	- fixed 3123763 -- lose context when organizing bookmarks
    	- handled empty or non-existent IE Favorites case better
    
            Reviewed by Darin
    
            * BookmarksController.m:
            (-[BookmarksController importInternetExplorerFavorites]):
    	Don't add a folder for IE Favorites if there are none.
    
            * BookmarksViewController.m:
            (-[BookmarksViewController selectBookmarkSource:]):
    	new method to select an item in Collections column
            (-[BookmarksViewController revealFavorite:expandChildren:]):
    	call selectBookmarkSource
            (-[BookmarksViewController tableView:draggedImage:endedAt:operation:]):
    	save and restore selected item in Collections column since row indices might change
            (-[BookmarksViewController tableView:acceptDrop:row:operation:]):
    	save and restore selected item in Collections column since row indices might change
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
index 8f3b1f0..65c2d97 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkImporter.m
@@ -200,7 +200,7 @@ static NSString *_linkTextFromSpec(NSString *spec)
     
     NSData *data = [[NSData alloc] initWithContentsOfFile:path];
     if (!data) {
-        error = [WebError errorWithCode:WebErrorCannotOpenFile inDomain:WebErrorDomainWebKit failingURL:path];
+        error = [[WebError alloc] initWithErrorCode:WebErrorCannotOpenFile inDomain:WebErrorDomainWebKit failingURL:path];
     }
 
     NSString *string = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 49e5415..db0afc5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-12-11  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3124640 -- Crash importing IE Favorites if there 
+	are no IE favorites
+
+        Reviewed by Darin
+
+        * Bookmarks.subproj/WebBookmarkImporter.m:
+        (-[WebBookmarkImporter initWithPath:]):
+	use alloc/init instead of autoreleasing constructor for error since
+	it's kept around until dealloc.
+
 2002-12-11  Darin Adler  <darin at apple.com>
 
         Reviewed by John.

-- 
WebKit Debian packaging