[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 4d86c06074e02d481cd80a2e19dc3420f19f0a20
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 10 23:36:46 2002 +0000

    WebKit:
    
            * History.subproj/WebHistoryPrivate.m:
            (-[WebHistoryPrivate _loadHistoryGuts:]):
    	removed the ERROR message in the case where the history file was
    	not found, as this is normal initial-state behavior.
    
    WebBrowser:
    
    	- fixed 3047715 -- "Favorites" should no longer be a special folder
    	- fixed 3030996 -- Why can't I delete an empty Favorites?
    	- some other miscellaneous cleanup
    
    	I haven't yet cleaned out all the old favorites-related code; wrote up
    	3047885 to represent that work.
    
            * BookmarksController.m:
            (-[BookmarksController imageForBookmark:]): don't special-case _favoritesRoot;
    	use "tiny_menu" as the "standard size" image instead of "heart_small".
            (-[BookmarksController awakeFromNib]): remove call to (and method)
    	_blessOrCreateFavoritesRoot; this makes _favoritesRoot always nil, so the
    	other code that special-cases it will never do anything interesting.
            (-[BookmarksController _newBookmarkSheetDidEnd:returnCode:contextInfo:]):
    	find toolbar item in pop-up menu a different way.
            (-[BookmarksController _addToolbarToMenu:]): new method, adds item to pop-up
    	menu that represents toolbar (needs an image though -- see 3047876)
            (-[BookmarksController _setUpPopUpMenuForNewBookmarksController:]):
    	add toolbar item to pop-up menu	instead of coopting "Favorites" item.
    
            * BrowserWindowController.h,
            * BrowserWindowController.m:
            (-[BrowserWindowController windowDidLoad]),
            (-[BrowserWindowController dealloc]): removed all references to favorites bar.
            (-[BrowserWindowController toggleLocationBarWithAnimation:]): fixed comment.
    
            * Defaults.plist: changed default "Add Bookmarks" location to "Toolbar"
            * English.lproj/Browser.nib: not sure what I changed, perhaps nothing.
    
            * PreferenceKeys.h: realphabetized.
    
            * Resources/Images/heart_small.tiff: Removed.
            * WebBrowser.pbproj/project.pbxproj: Updated for removed file.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index aec85e4..69a7cd3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-10  John Sullivan  <sullivan at apple.com>
+
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate _loadHistoryGuts:]):
+	removed the ERROR message in the case where the history file was
+	not found, as this is normal initial-state behavior.
+
 2002-09-10  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit part of fix for:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index aec85e4..69a7cd3 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-10  John Sullivan  <sullivan at apple.com>
+
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate _loadHistoryGuts:]):
+	removed the ERROR message in the case where the history file was
+	not found, as this is normal initial-state behavior.
+
 2002-09-10  Maciej Stachowiak  <mjs at apple.com>
 
 	WebKit part of fix for:
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index 91b8b5d..e137f9b 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -381,11 +381,9 @@
 
     array = [NSArray arrayWithContentsOfFile: path];
     if (array == nil) {
-        if (![[NSFileManager defaultManager] fileExistsAtPath: path]) {
-            ERROR("no history file found at %@", path);
-        } else {
+        if ([[NSFileManager defaultManager] fileExistsAtPath: path]) {
             ERROR("attempt to read history from %@ failed; perhaps contents are corrupted", path);
-        }
+        } // else file doesn't exist, which is a normal initial state, so don't spam
         return NO;
     }
 

-- 
WebKit Debian packaging