[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 d29c0774c351a3221651e1c7dc4c2417c8a1283c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 27 22:07:57 2003 +0000

    	Fixed 3397235.  WebView wasn't archiving useBackForwardList.
    
            Reviewed by Eric Seymour.
    
            * WebView.subproj/WebView.m:
            (-[WebView initWithCoder:]):
            (-[WebView encodeWithCoder:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a0f3055..cb1f7da 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-27  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3397235.  WebView wasn't archiving useBackForwardList.
+
+        Reviewed by Eric Seymour.
+
+        * WebView.subproj/WebView.m:
+        (-[WebView initWithCoder:]):
+        (-[WebView encodeWithCoder:]):
+
 2003-08-26  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3385478.  Look for an exact match for font names (using PS names)	before matching on family names.
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index d58cb19..e9a807c 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -59,7 +59,7 @@ NSString *WebViewProgressStartedNotification = @"WebProgressStartedNotification"
 NSString *WebViewProgressEstimateChangedNotification = @"WebProgressEstimateChangedNotification";
 NSString *WebViewProgressFinishedNotification = @"WebProgressFinishedNotification";
 
-enum { WebViewVersion = 1 };
+enum { WebViewVersion = 2 };
 
 
 @implementation WebView
@@ -150,17 +150,18 @@ NS_DURING
         NSString *groupName = [decoder decodeObjectForKey:@"GroupName"];
         [result _commonInitializationFrameName:frameName groupName:groupName];
         [result setPreferences: [decoder decodeObjectForKey:@"Preferences"]];
+	_private->useBackForwardList = [decoder decodeBoolForKey:@"UseBackForwardList"];
     }
     else {
         int version;
     
         [decoder decodeValueOfObjCType:@encode(int) at:&version];
-        if (version == 1){
-            NSString *frameName = [decoder decodeObject];
-            NSString *groupName = [decoder decodeObject];
-            [result _commonInitializationFrameName:frameName groupName:groupName];
-            [result setPreferences: [decoder decodeObject]];
-        }
+        NSString *frameName = [decoder decodeObject];
+        NSString *groupName = [decoder decodeObject];
+        [result _commonInitializationFrameName:frameName groupName:groupName];
+        [result setPreferences: [decoder decodeObject]];
+        if (version > 1)
+            [decoder decodeValuesOfObjCTypes:"c",&_private->useBackForwardList];
     }
     
 NS_HANDLER
@@ -181,6 +182,7 @@ NS_ENDHANDLER
         [encoder encodeObject:[[self mainFrame] name] forKey:@"FrameName"];
         [encoder encodeObject:[self groupName] forKey:@"GroupName"];
         [encoder encodeObject:[self preferences] forKey:@"Preferences"];
+	[encoder encodeBool:_private->useBackForwardList forKey:@"UseBackForwardList"];
     }
     else {
         int version = WebViewVersion;
@@ -188,6 +190,7 @@ NS_ENDHANDLER
         [encoder encodeObject:[[self mainFrame] name]];
         [encoder encodeObject:[self groupName]];
         [encoder encodeObject:[self preferences]];
+        [encoder encodeValuesOfObjCTypes:"c",&_private->useBackForwardList];
     }
 }
 

-- 
WebKit Debian packaging