[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 bb6206f6a6a7a1c597e59a7bef470cb7d166090c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 16 02:18:48 2003 +0000

            Create the dictionary for volatile values.  Without this fix
            values were never volatile!
    
            Reviewed by mjs.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences _init]):
            (-[WebPreferences init]):
            (+[WebPreferences standardPreferences]):
            (-[WebPreferences dealloc]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3cd56fa..dbb1522 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2003-04-15  Richard Williamson   <rjw at apple.com>
 
+        Create the dictionary for volatile values.  Without this fix
+        values were never volatile!
+        
+        Reviewed by mjs.
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences _init]):
+        (-[WebPreferences init]):
+        (+[WebPreferences standardPreferences]):
+        (-[WebPreferences dealloc]):
+
+2003-04-15  Richard Williamson   <rjw at apple.com>
+
         Fix for 3226746.  Remove some ancient and apparantly invalid cruft.
         
         Reviewed by trey.
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index d889a22..eae2939 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -49,12 +49,26 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
                     userInfo:nil];
 }
 
+// Only used tp initialize the shared instance.
+- _init
+{
+    [super init];
+    return self;
+}
+
+- init
+{
+    [super init];
+    values = [[NSMutableDictionary alloc] init];
+    return self;
+}
+
 + (WebPreferences *)standardPreferences
 {
     static WebPreferences *_standardPreferences = nil;
 
     if (_standardPreferences == nil) {
-        _standardPreferences = [[WebPreferences alloc] init];
+        _standardPreferences = [[WebPreferences alloc] _init];
         [_standardPreferences _postPreferencesChangesNotification];
     }
 
@@ -97,6 +111,12 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
 }
 
+- (void)dealloc
+{
+    [values release];
+    [super dealloc];
+}
+
 - (NSString *)_stringValueForKey: (NSString *)key
 {
     NSString *s = [values objectForKey:key];
@@ -109,8 +129,9 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
 {
     if (self == [WebPreferences standardPreferences])
         [[NSUserDefaults standardUserDefaults] setObject:value forKey:key];
-    else
+    else {
         [values setObject: value forKey: key];
+    }
     [self _postPreferencesChangesNotification];
 }
 
@@ -126,8 +147,9 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
 {
     if (self == [WebPreferences standardPreferences])
         [[NSUserDefaults standardUserDefaults] setInteger:value forKey:key];
-    else
+    else{
         [values _web_setInt: value forKey: key];
+    }
     [self _postPreferencesChangesNotification];
 }
 
@@ -143,8 +165,9 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
 {
     if (self == [WebPreferences standardPreferences])
         [[NSUserDefaults standardUserDefaults] setBool:value forKey:key];
-    else
+    else{
         [values _web_setBool: value forKey: key];
+    }
     [self _postPreferencesChangesNotification];
 }
 

-- 
WebKit Debian packaging