[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 e0bef560383a9e11404bde0b331e705a190b1b8f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 27 20:50:34 2003 +0000

            Fixed: 3242864 - repro assertion failure in WebIconDatabase.m for www.shutterfly.com
    
            Reviewed by john.
    
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader connectionDidFinishLoading:]): don't set the icon on the DB if it has no representations
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4427 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ac8d5e5..a7cf37b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-27  Chris Blumenberg  <cblu at apple.com>
+
+        Fixed: 3242864 - repro assertion failure in WebIconDatabase.m for www.shutterfly.com
+
+        Reviewed by john.
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader connectionDidFinishLoading:]): don't set the icon on the DB if it has no representations
+
 2003-05-27  Richard Williamson   <rjw at apple.com>
 
 	Fixes for IB.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 10fa715..6559e60 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -98,7 +98,7 @@
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection
 {
     NSImage *icon = [[NSImage alloc] initWithData:_private->resourceData];
-    if (icon) {
+    if (icon && [[icon representations] count]) {
         [[WebIconDatabase sharedIconDatabase] _setIcon:icon forIconURL:[[self URL] absoluteString]];
     } else {
 	[[WebIconDatabase sharedIconDatabase] _setHaveNoIconForIconURL:[[self URL] absoluteString]];

-- 
WebKit Debian packaging