[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 b858329fb6b2e2adad0c9488979c97d1ace4da79
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 4 20:41:45 2003 +0000

    	Fixed: 3163879 - receivedPageIcon:forDataSource: always sends nil image
    
            Reviewed by rjw.
    
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _updateIconDatabaseWithURL:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d442f36..34c4a07 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-04  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3163879 - receivedPageIcon:forDataSource: always sends nil image
+
+        Reviewed by rjw.
+
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _updateIconDatabaseWithURL:]): 
+
 2003-02-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5f60453..948d1c2 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -536,7 +536,9 @@
     // Bind the URL of the original request and the final URL to the icon URL.
     [iconDB _setIconURL:[iconURL absoluteString] forURL:[[self URL] absoluteString]];
     [iconDB _setIconURL:[iconURL absoluteString] forURL:[[[self _originalRequest] URL] absoluteString]];
-    [[_private->controller locationChangeDelegate] receivedPageIcon:nil forDataSource:self];
+
+    NSImage *icon = [iconDB iconForURL:[[self URL] absoluteString] withSize:WebIconSmallSize];
+    [[_private->controller locationChangeDelegate] receivedPageIcon:icon forDataSource:self];
 }
 
 - (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)icon;

-- 
WebKit Debian packaging