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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 79eccd0eac2ac1b27cd6104c92865ca7814eeb82
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 25 22:12:59 2002 +0000

    	- Allow missing icons to be restored when going to the page of the missing icon.
    
            * Misc.subproj/WebIconDatabase.m:
            (-[WebIconDatabase _setIconURL:forSiteURL:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c3901bf..f64dd4b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-25  Chris Blumenberg  <cblu at apple.com>
+
+	- Allow missing icons to be restored when going to the page of the missing icon.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _setIconURL:forSiteURL:]):
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Changes for back/forward.  Currently disabled.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c3901bf..f64dd4b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-25  Chris Blumenberg  <cblu at apple.com>
+
+	- Allow missing icons to be restored when going to the page of the missing icon.
+
+        * Misc.subproj/WebIconDatabase.m:
+        (-[WebIconDatabase _setIconURL:forSiteURL:]):
+
 2002-11-25  Richard Williamson   <rjw at apple.com>
 
         Changes for back/forward.  Currently disabled.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 091e8e1..3f6209d 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -420,7 +420,8 @@ NSSize WebIconLargeSize = {128, 128};
     NSString *siteURLString = [siteURL absoluteString];
     NSString *iconURLString = [iconURL absoluteString];
 
-    if([[_private->siteURLToIconURL objectForKey:siteURLString] isEqualToString:iconURLString]){
+    if([[_private->siteURLToIconURL objectForKey:siteURLString] isEqualToString:iconURLString] &&
+       [_private->iconsOnDiskWithURLs containsObject:iconURLString]){
         // Don't do any work if the icon URL is already bound to the site URL
         return;
     }

-- 
WebKit Debian packaging