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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 2778da17791b3ad473e3a82490c124d07e115cc2
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 5 00:56:40 2003 +0000

            Reviewed by Maciej.
    
            - got rid of some framework initialization (working on bug 3185161)
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences _postPreferencesChangesNotification]): Moved this function up.
            (+[WebPreferences standardPreferences]): Call _postPreferencesChangesNotification when this is made,
            for consistency with the old behavior.
            (+[WebPreferences initialize]): Changed to initialize from load, and got rid of stuff we don't want
            to do from inside an initialize function.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1760e06..a0d6024 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-03-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - got rid of some framework initialization (working on bug 3185161)
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences _postPreferencesChangesNotification]): Moved this function up.
+        (+[WebPreferences standardPreferences]): Call _postPreferencesChangesNotification when this is made,
+        for consistency with the old behavior.
+        (+[WebPreferences initialize]): Changed to initialize from load, and got rid of stuff we don't want
+        to do from inside an initialize function.
+
 2003-03-04  Richard Williamson   <rjw at apple.com>
 
         Remove initWithURL: and frameName from WebDataSource public API.
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 61c53ac..19ab54e 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -42,29 +42,28 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
 
 @implementation WebPreferences
 
+- (void)_postPreferencesChangesNotification
+{
+    [[NSNotificationCenter defaultCenter]
+        postNotificationName:WebPreferencesChangedNotification object:self
+                    userInfo:nil];
+}
+
 + (WebPreferences *)standardPreferences
 {
     static WebPreferences *_standardPreferences = nil;
 
     if (_standardPreferences == nil) {
         _standardPreferences = [[WebPreferences alloc] init];
+        [_standardPreferences _postPreferencesChangesNotification];
     }
 
     return _standardPreferences;
 }
 
-- (void)_postPreferencesChangesNotification
-{
-    [[NSNotificationCenter defaultCenter]
-        postNotificationName:WebPreferencesChangedNotification object:self
-                    userInfo:nil];
-}
-
 // if we ever have more than one WebPreferences object, this would move to init
-+ (void)load
++ (void)initialize
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         @"0x0",                         WebKitLogLevelPreferenceKey,
         @"Lucida Grande",               WebKitStandardFontPreferenceKey,
@@ -96,17 +95,6 @@ NSString *WebPreferencesChangedNotification = @"WebPreferencesChangedNotificatio
         nil];
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:dict];
-
-/*
-    [[NSNotificationCenter defaultCenter]
-        addObserver:[self standardPreferences]
-           selector:@selector(_postPreferencesChangesNotification)
-               name:NSUserDefaultsDidChangeNotification
-             object:[NSUserDefaults standardUserDefaults]];
-*/    
-    [[self standardPreferences] _postPreferencesChangesNotification];
-
-    [pool release];
 }
 
 - (NSString *)_stringValueForKey: (NSString *)key

-- 
WebKit Debian packaging