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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 61fb9fd416125baa16151721b99603ef0e38382b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 3 23:24:02 2003 +0000

    	Fix part of 3438071.  Creating an instance of WebPreferences using init
    	will do the expected thing:  that is, create a new instance!  We used to
    	always return standardPreferences.
    
            Reviewed by Chris.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences init]):
            (+[WebPreferences standardPreferences]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 66b5c1d..9d2e880 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-10-03  Richard Williamson (Home0  <rjw at apple.com>
+
+	Fix part of 3438071.  Creating an instance of WebPreferences using init
+	will do the expected thing:  that is, create a new instance!  We used to
+	always return standardPreferences.
+
+        Reviewed by Chris.
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences init]):
+        (+[WebPreferences standardPreferences]):
+
 2003-10-03  David Hyatt  <hyatt at apple.com>
 
 	Fix for numerous regressions caused by an inadvertent renaming of the recursiveDisplay
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 54af7c9..68af1d5 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -307,6 +307,7 @@ WebView.subproj/WebDataSourcePrivate.m:"Refresh"
 WebView.subproj/WebFrame.m:"utf-16"
 WebView.subproj/WebPreferences.m:"Identifier"
 WebView.subproj/WebPreferences.m:"Values"
+WebView.subproj/WebPreferences.m:"WebPreferences%d"
 WebView.subproj/WebRenderNode.m
 WebView.subproj/WebView.m:"Preferences"
 WebView.subproj/WebViewPrivate.m:"canGoBack"
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 247ab1b..449cf90 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -80,7 +80,17 @@ enum { WebPreferencesVersion = 1 };
 
 - init
 {
-    return [self initWithIdentifier:nil];
+    // Create fake identifier
+    static int instanceCount = 1;
+    NSString *fakeIdentifier;
+    
+    // At least ensure that identifier hasn't been already used.  
+    fakeIdentifier = [NSString stringWithFormat:@"WebPreferences%d", instanceCount++];
+    while ([[self class] _getInstanceForIdentifier:fakeIdentifier]){
+        fakeIdentifier = [NSString stringWithFormat:@"WebPreferences%d", instanceCount++];
+    }
+    
+    return [self initWithIdentifier:fakeIdentifier];
 }
 
 static WebPreferences *_standardPreferences = nil;
@@ -173,7 +183,7 @@ NS_ENDHANDLER
 + (WebPreferences *)standardPreferences
 {
     if (_standardPreferences == nil) {
-        _standardPreferences = [[WebPreferences alloc] init];
+        _standardPreferences = [[WebPreferences alloc] initWithIdentifier:nil];
         [_standardPreferences setAutosaves:YES];
         [_standardPreferences _postPreferencesChangesNotification];
     }

-- 
WebKit Debian packaging