[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 63a9bb8ef947cd4d43e3f939acb7801853b50f97
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 31 20:39:00 2003 +0000

    	Fixed 3358870.  Fall back on 'user defaults' values when a value
    	in a custom instance of WebPreferences hasn't been overriden.
    
            Reviewed by Eric Seymour.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences _stringValueForKey:]):
            (-[WebPreferences _integerValueForKey:]):
            (-[WebPreferences _boolValueForKey:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4748 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1e570f0..6ec6d73 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-31  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3358870.  Fall back on 'user defaults' values when a value
+	in a custom instance of WebPreferences hasn't been overriden.
+
+        Reviewed by Eric Seymour.
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences _stringValueForKey:]):
+        (-[WebPreferences _integerValueForKey:]):
+        (-[WebPreferences _boolValueForKey:]):
+
 2003-07-30  Richard Williamson   <rjw at apple.com>
 
 	Preparation for 3095376.
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index a702be4..a944757 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -233,7 +233,10 @@ NS_ENDHANDLER
     NSString *s = [_private->values objectForKey:_key];
     if (s)
         return s;
-    return [[NSUserDefaults standardUserDefaults] stringForKey:_key];
+    s = [[NSUserDefaults standardUserDefaults] stringForKey:_key];
+    if (!s)
+        s = [[NSUserDefaults standardUserDefaults] stringForKey:key];
+    return s;
 }
 
 - (void)_setStringValue: (NSString *)value forKey: (NSString *)key
@@ -253,7 +256,10 @@ NS_ENDHANDLER
     NSNumber *n = [_private->values objectForKey:_key];
     if (n)
         return [n intValue];
-    return [[NSUserDefaults standardUserDefaults] integerForKey:_key];
+    n = [[NSUserDefaults standardUserDefaults] objectForKey:_key];
+    if (!n)
+        n = [[NSUserDefaults standardUserDefaults] objectForKey:key];
+    return [n intValue];
 }
 
 - (void)_setIntegerValue: (int)value forKey: (NSString *)key
@@ -273,7 +279,10 @@ NS_ENDHANDLER
     NSNumber *n = [_private->values objectForKey:_key];
     if (n)
         return [n boolValue];
-    return [[NSUserDefaults standardUserDefaults] integerForKey:_key];
+    n = [[NSUserDefaults standardUserDefaults] objectForKey:_key];
+    if (!n)
+        n = [[NSUserDefaults standardUserDefaults] objectForKey:key];
+    return [n intValue] != 0 ? YES : NO;
 }
 
 - (void)_setBoolValue: (BOOL)value forKey: (NSString *)key

-- 
WebKit Debian packaging