[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 14c6538d1757fd1a6cda988af5fd37045a34ca43
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 22 22:27:04 2002 +0000

    WebKit:
    
    	- fixed 3080873 -- Error in console when no bookmark file
    	found -[WebBookmarkGroup _loadBookmarkGroupGuts]
    
            * Bookmarks.subproj/WebBookmarkGroup.m:
            (-[WebBookmarkGroup _loadBookmarkGroupGuts]):
    	removed ERROR that was useful only long ago.
    
    WebBrowser:
    
    	- fixed buggy case with my previous checkin
    
            * ActivityViewer.h: new ivar _pendingExpansionItems
            * ActivityViewer.m:
            (-[ActivityViewer init]): create empty _pendingExpansionItems
            (-[ActivityViewer dealloc]): release _pendingExpansionItems
            (-[ActivityViewer expandPendingItems]):
    	expand _pendingExpansionItems and empty the set
            (-[ActivityViewer showActivity:]):
    	call expandPendingItems when window becomes visible
            (-[ActivityViewer addTopLevelActivity:]):
    	if window is not visible, save item in _pendingExpansionItems
    	to expand later.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 76f426b..9d33d56 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -184,11 +184,10 @@
 
     dictionary = [NSDictionary dictionaryWithContentsOfFile: path];
     if (dictionary == nil) {
-        if (![[NSFileManager defaultManager] fileExistsAtPath: path]) {
-            ERROR("no bookmarks file found at %@", path);
-        } else {
+        if ([[NSFileManager defaultManager] fileExistsAtPath: path]) {
             ERROR("attempt to read bookmarks from %@ failed; perhaps contents are corrupted", path);
         }
+        // else file doesn't exist, which is normal the first time
         return NO;
     }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 076fa5f..0fcb43a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-22  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3080873 -- Error in console when no bookmark file 
+	found -[WebBookmarkGroup _loadBookmarkGroupGuts]
+
+        * Bookmarks.subproj/WebBookmarkGroup.m:
+        (-[WebBookmarkGroup _loadBookmarkGroupGuts]):
+	removed ERROR that was useful only long ago.
+
 2002-10-22  Richard Williamson  <rjw at apple.com>
 
         Added stubs from common WebResourceHandleDelegate base
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 076fa5f..0fcb43a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-22  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3080873 -- Error in console when no bookmark file 
+	found -[WebBookmarkGroup _loadBookmarkGroupGuts]
+
+        * Bookmarks.subproj/WebBookmarkGroup.m:
+        (-[WebBookmarkGroup _loadBookmarkGroupGuts]):
+	removed ERROR that was useful only long ago.
+
 2002-10-22  Richard Williamson  <rjw at apple.com>
 
         Added stubs from common WebResourceHandleDelegate base

-- 
WebKit Debian packaging