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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 2c24e32464f460438bb7d0951db0449220aa6d33
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 19:19:06 2003 +0000

    	- fixed 3245793 -- Launching Safari-75 after tip of tree
    	erases all history
    
            Reviewed by Chris, Don
    
            * History.subproj/WebHistoryItem.m:
    	keep using "lastVisitedDate" as the dictionary key, since old
    	Safaris otherwise can't read the History file.
            (-[WebHistoryItem dictionaryRepresentation]):
    	keep storing the time interval as a string, since old Safaris
    	otherwise can't read the History file
            (-[WebHistoryItem initFromDictionaryRepresentation:]):
    	read the stored date as a string and convert to a double,
    	as we did before.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4246 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3068354..9fe54c9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2003-05-01  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3245793 -- Launching Safari-75 after tip of tree 
+	erases all history
+
+        Reviewed by Chris, Don
+
+        * History.subproj/WebHistoryItem.m:
+	keep using "lastVisitedDate" as the dictionary key, since old
+	Safaris otherwise can't read the History file.
+        (-[WebHistoryItem dictionaryRepresentation]):
+	keep storing the time interval as a string, since old Safaris
+	otherwise can't read the History file
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+	read the stored date as a string and convert to a double,
+	as we did before.
+
 2003-05-01  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 73fc472..e03db28 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -17,9 +17,9 @@
 #import <CoreGraphics/CoreGraphicsPrivate.h>
 
 // Private keys used in the WebHistoryItem's dictionary representation.
-static NSString *WebLastVisitedTimeIntervalKey = @"lastVisitedTimeInterval";
+// see 3245793 for explanation of "lastVisitedDate"
+static NSString *WebLastVisitedTimeIntervalKey = @"lastVisitedDate";
 static NSString *WebVisitCountKey = @"visitCount";
-static NSString *WebOBSOLETELastVisitedDateKey = @"lastVisitedDate";
 static NSString *WebTitleKey = @"title";
 static NSString *WebChildrenKey = @"children";
 static NSString *WebDisplayTitleKey = @"displayTitle";
@@ -491,7 +491,9 @@ static NSString *WebDisplayTitleKey = @"displayTitle";
         [dict setObject:_private->displayTitle forKey:WebDisplayTitleKey];
     }
     if (_private->lastVisitedTimeInterval != 0.0) {
-        [dict _web_setDouble:_private->lastVisitedTimeInterval forKey:WebLastVisitedTimeIntervalKey];
+        // store as a string to maintain backward compatibility (see 3245793)
+        [dict setObject:[NSString stringWithFormat:@"%.1lf", _private->lastVisitedTimeInterval]
+                 forKey:WebLastVisitedTimeIntervalKey];
     }
     if (_private->visitCount) {
         [dict setObject:[NSNumber numberWithInt:_private->visitCount] forKey:WebVisitCountKey];
@@ -517,15 +519,7 @@ static NSString *WebDisplayTitleKey = @"displayTitle";
 
     [self setAlternateTitle:[dict _web_stringForKey:WebDisplayTitleKey]];
 
-    // We used to store a string representation of the date.  If we can't
-    // find a time interval check for the presence of that old string.
-    _private->lastVisitedTimeInterval = [dict _web_doubleForKey:WebLastVisitedTimeIntervalKey];
-    if (_private->lastVisitedTimeInterval == 0.0){
-        NSString *date = [dict _web_stringForKey:WebOBSOLETELastVisitedDateKey];
-        if (date)
-            _private->lastVisitedTimeInterval = [date doubleValue];
-    }
-
+    _private->lastVisitedTimeInterval = [[dict _web_stringForKey:WebLastVisitedTimeIntervalKey] doubleValue];
     _private->visitCount = [dict _web_intForKey:WebVisitCountKey];
 
     NSArray *childDicts = [dict objectForKey:WebChildrenKey];

-- 
WebKit Debian packaging