[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 8f287f81dca57179f278ace94ffac99218aabde6
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 22:31:25 2003 +0000

    	- fixed 3246045 -- History items without a valid date in
    	History.plist show up with unexpected dates in UI
    
            Reviewed by Darin.
    
            * History.subproj/WebHistoryItem.m:
            (-[WebHistoryItem initFromDictionaryRepresentation:]):
    	don't set lastVisitedTimeInterval to [nil doubleValue],
    	since this is random
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c44e956..1cee9ae 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-05-01  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3246045 -- History items without a valid date in 
+	History.plist show up with unexpected dates in UI
+
+        Reviewed by Darin.
+
+        * History.subproj/WebHistoryItem.m:
+        (-[WebHistoryItem initFromDictionaryRepresentation:]):
+	don't set lastVisitedTimeInterval to [nil doubleValue],
+	since this is random
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2003-05-01  Richard Williamson   <rjw at apple.com>
 
         Added missing header and alphabetized.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 381eb15..56e79c0 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -2,6 +2,7 @@
 " *POST*"
 " *target*"
 " >>>"
+"%.1lf"
 "%2d) "
 "%@ %@"
 "%@/Library/Caches/WebKitIcons/%@"
@@ -224,7 +225,6 @@
 "http"
 "https"
 "lastVisitedDate"
-"lastVisitedTimeInterval"
 "mp4"
 "mpg4"
 "nullplugin"
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index e03db28..3fa8636 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -519,7 +519,12 @@ static NSString *WebDisplayTitleKey = @"displayTitle";
 
     [self setAlternateTitle:[dict _web_stringForKey:WebDisplayTitleKey]];
 
-    _private->lastVisitedTimeInterval = [[dict _web_stringForKey:WebLastVisitedTimeIntervalKey] doubleValue];
+    // Do an existence check to avoid calling doubleValue on a nil string. Leave
+    // time interval at 0 if there's no value in dict.
+    NSString *timeIntervalString = [dict _web_stringForKey:WebLastVisitedTimeIntervalKey];
+    if (timeIntervalString != nil) {
+        _private->lastVisitedTimeInterval = [timeIntervalString doubleValue];
+    }
     _private->visitCount = [dict _web_intForKey:WebVisitCountKey];
 
     NSArray *childDicts = [dict objectForKey:WebChildrenKey];

-- 
WebKit Debian packaging