[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 412290942e5981e73292b9f5218d15950cac2747
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 27 18:34:05 2003 +0000

    	Fixes for IB.
    
            Reviewed by Eric Seymour.
    
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences initWithCoder:]):
    	Added retain to uniqued instance
    
            * WebView.subproj/WebView.m:
            (-[WebView initWithCoder:]):
            (-[WebView setPreferences:]):
    	Added release check to global uniquing dictionary.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3605e7c..ac8d5e5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-05-27  Richard Williamson   <rjw at apple.com>
+
+	Fixes for IB.
+
+        Reviewed by Eric Seymour.
+
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences initWithCoder:]):
+	Added retain to uniqued instance 
+
+        * WebView.subproj/WebView.m:
+        (-[WebView initWithCoder:]):
+        (-[WebView setPreferences:]):
+	Added release check to global uniquing dictionary.
+
 2003-05-23  Richard Williamson   <rjw at apple.com>
 
 	Tweaks for IB.
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index 3c59416..634343d 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -121,8 +121,8 @@ NS_DURING
     // nibs with the same name, the first guy up wins.
     WebPreferences *instance = [[self class] _getInstanceForIdentifier:_private->identifier];
     if (instance){
-        [self autorelease];
-        result = instance;
+        [self release];
+        result = [instance retain];
     }
     else {
         [[self class] _setInstance:self forIdentifier:_private->identifier];
@@ -132,7 +132,7 @@ NS_DURING
 NS_HANDLER
 
     result = nil;
-    [self autorelease];
+    [self release];
     
 NS_ENDHANDLER
 
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index 8c9ea11..5b335d9 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -160,7 +160,7 @@ NS_DURING
 NS_HANDLER
 
     result = nil;
-    [self autorelease];
+    [self release];
 
 NS_ENDHANDLER
 
@@ -203,6 +203,7 @@ NS_ENDHANDLER
 {
     if (_private->preferences != prefs){
         [[NSNotificationCenter defaultCenter] removeObserver: self name: WebPreferencesChangedNotification object: [self preferences]];
+        [WebPreferences _removeReferenceForIdentifier: [_private->preferences identifier]];
         [_private->preferences release];
         _private->preferences = [prefs retain];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:)

-- 
WebKit Debian packaging