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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 8b0598db6139d8b27ec4e91d20edc16543be5ec2
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 10 00:46:50 2003 +0000

            Reviewed by Chris, Trey, Darin and Don.
    
    	- fixed 3223568 - site icons lost when moving from older Safari to 71
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _createFileDatabase]): Rename old database containing directory to
    	new, so we carry over old databases. The format is forward but not backward compatible.
            (-[WebIconDatabase _loadIconDictionaries]): Treat no version at all as version 1, so we
    	can load old-style databases.
    
    	Reviewed by Trey.
    
    	* English.lproj/StringsNotToBeLocalized.txt: Updated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 32deedb..23c4c10 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-04-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Chris, Trey, Darin and Don.
+
+	- fixed 3223568 - site icons lost when moving from older Safari to 71
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _createFileDatabase]): Rename old database containing directory to
+	new, so we carry over old databases. The format is forward but not backward compatible.
+        (-[WebIconDatabase _loadIconDictionaries]): Treat no version at all as version 1, so we
+	can load old-style databases.
+
+	Reviewed by Trey.
+
+	* English.lproj/StringsNotToBeLocalized.txt: Updated.
+	
 2003-04-09  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3223022 - Plug-in content bleeds onto frontmost tab
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 97c9d9f..3b206d8 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -9,6 +9,7 @@
 "%@/%@"
 "%@/Library/Preferences/%@"
 "%@:%u"
+"%@://%p"
 "%d"
 "(This file must be converted with BinHex 4.0)"
 ","
@@ -37,6 +38,7 @@
 "BP_CreatePluginMIMETypesPreferences"
 "BufferTextDrawing"
 "Content-Disposition"
+"Content-Length"
 "Courier"
 "DOCBASE"
 "DirectionAL"
@@ -64,7 +66,9 @@
 "JoiningOther"
 "JoiningRight"
 "Joy!peff"
-"Library/Caches/com.apple.WebKit/Icons"
+"Library/Caches/WebKit"
+"Library/Caches/WebKit/Icons"
+"Library/Caches/com.apple.WebKit"
 "Library/Internet Plug-Ins"
 "Lucida Grande"
 "MP4 Audio"
@@ -81,6 +85,9 @@
 "NP_Shutdown"
 "NSApplicationIcon"
 "NSEvent"
+"NSTextView"
+"NSView"
+"NSWindow"
 "POST"
 "Papyrus"
 "QuickTime Plugin.plugin"
@@ -127,6 +134,7 @@
 "WebHostToSiteURLs"
 "WebIconDatabaseDidAddIconNotification"
 "WebIconDatabaseDirectory"
+"WebIconDatabaseVersion"
 "WebIconNotificationUserInfoURLKey"
 "WebIconURLToSiteURLs"
 "WebIconsOnDisk"
@@ -164,6 +172,9 @@
 "WebKitUserStyleSheetLocationPreferenceKey"
 "WebMethodNotYetImplemented"
 "WebModalDialogPretendWindow"
+"WebNSTextView"
+"WebNSView"
+"WebNSWindow"
 "WebPluginAttributes"
 "WebPluginBaseURL"
 "WebPluginContainer"
@@ -243,6 +254,8 @@ WebCoreSupport.subproj/WebBridge.m:"height"
 WebCoreSupport.subproj/WebBridge.m:"width"
 WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
 WebCoreSupport.subproj/WebTextRenderer.m:"YES"
+WebView.subproj/WebDataProtocol.m:"applewebdata"
 WebView.subproj/WebDataSourcePrivate.m:"Refresh"
+WebView.subproj/WebFrame.m:"utf-16"
 WebView.subproj/WebPreferences.m:"latin1"
 WebView.subproj/WebRenderNode.m
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index f684791..bf07eaf 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -15,6 +15,9 @@
 #import <WebFoundation/WebNSURLExtras.h>
 #import <WebFoundation/WebFileDatabase.h>
 
+#define WebIconDatabaseOldContainingDirectory ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Caches/com.apple.WebKit"])
+#define WebIconDatabaseNewContainingDirectory ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Caches/WebKit"])
+
 #define WebIconDatabaseDefaultDirectory ([NSString stringWithFormat:@"%@/%@", NSHomeDirectory(), @"Library/Caches/WebKit/Icons"])
 
 NSString * const WebIconDatabaseVersionKey = @"WebIconDatabaseVersion";
@@ -217,6 +220,11 @@ NSSize WebIconLargeSize = {128, 128};
 
 - (void)_createFileDatabase
 {
+    // Move over the old database, if we have one. If the new database
+    // already exists, this call will fail with ENOTEMPTY, so we don't
+    // need to worry about overwriting it.
+    rename([WebIconDatabaseOldContainingDirectory fileSystemRepresentation], [WebIconDatabaseNewContainingDirectory fileSystemRepresentation]);
+
     // FIXME: Make defaults key public somehow
     NSString *databaseDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:@"WebIconDatabaseDirectory"];
 
@@ -275,7 +283,15 @@ NSSize WebIconLargeSize = {128, 128};
     WebFileDatabase *fileDB = _private->fileDatabase;
 
     NSNumber *version = [fileDB objectForKey:WebIconDatabaseVersionKey];
-    if (version != nil && [version isKindOfClass:[NSNumber class]] && [version intValue] == WebIconDatabaseCurrentVersion) {
+    int v = 0;
+    // no version means first version
+    if (version == nil) {
+	v = 1;
+    } else if ([version isKindOfClass:[NSNumber class]]) {
+	v = [version intValue];
+    }
+
+    if (v == WebIconDatabaseCurrentVersion) {
 	_private->iconsOnDiskWithURLs = 	[fileDB objectForKey:WebIconsOnDiskKey];
 	_private->URLToIconURL = 		[fileDB objectForKey:WebURLToIconURLKey];
 	_private->iconURLToURLs = 	[fileDB objectForKey:WebIconURLToURLsKey];

-- 
WebKit Debian packaging