[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 8f5702cdd655cda7877edd9ff517bc72d55aa1bf
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 04:15:30 2002 +0000

    WebKit:
    
    	Renamed icon loader delegate method to include the icon loader.
    
            * Misc.subproj/WebIconLoader.h:
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
            * WebView.subproj/WebDataSourcePrivate.m:
    
    WebBrowser:
    
    	Rendezvous changes:
    	Properly get host's IP address.
    	Load and display host's favicon.
    
            * English.lproj/Rendezvous.nib:
            * RendezvousController.m:
            (-[RendezvousController windowDidLoad]):
            (-[RendezvousController _attributedStringWithImage:]):
            (-[RendezvousController goToHostDoubleAction:]):
            (-[RendezvousController tableView:objectValueForTableColumn:row:]):
            (-[RendezvousController netServiceBrowser:didFindService:moreComing:]):
            (-[RendezvousController netServiceBrowser:didRemoveService:moreComing:]):
            (+[RendezvousController _URLForNetService:]):
            (-[RendezvousController netServiceDidResolveAddress:]):
            (-[RendezvousController iconLoader:receivedPageIcon:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9a707f2..0a04e1d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-05  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed icon loader delegate method to include the icon loader.
+
+        * Misc.subproj/WebIconLoader.h:
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
+        * WebView.subproj/WebDataSourcePrivate.m:
+
 2002-08-05  Richard Williamson (Home)  <rjw at apple.com>
 
         Added additional check to find appropriate fonts with available
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9a707f2..0a04e1d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-08-05  Chris Blumenberg  <cblu at apple.com>
+
+	Renamed icon loader delegate method to include the icon loader.
+
+        * Misc.subproj/WebIconLoader.h:
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader WebResourceHandleDidFinishLoading:data:]):
+        * WebView.subproj/WebDataSourcePrivate.m:
+
 2002-08-05  Richard Williamson (Home)  <rjw at apple.com>
 
         Added additional check to find appropriate fonts with available
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index 1b323b4..46296ee 100644
--- a/WebKit/Misc.subproj/WebIconLoader.h
+++ b/WebKit/Misc.subproj/WebIconLoader.h
@@ -13,10 +13,6 @@
 @class WebIconLoaderPrivate;
 @protocol WebResourceClient;
 
- at interface NSObject(WebIconLoaderDelegate)
-- (void)receivedPageIcon:(NSImage *)image;
- at end;
-
 @interface WebIconLoader : NSObject <WebResourceClient>
 {
     WebIconLoaderPrivate *_private;
@@ -30,3 +26,7 @@
 - (void)startLoadingOnlyFromCache;
 - (void)stopLoading;
 @end
+
+ at interface NSObject(WebIconLoaderDelegate)
+- (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)image;
+ at end;
\ No newline at end of file
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index e29db7f..3176443 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -103,7 +103,7 @@
 {
     NSImage *image = [[NSImage alloc] initWithData:data];
     if (image) {
-        [_private->delegate receivedPageIcon:image];
+        [_private->delegate iconLoader:self receivedPageIcon:image];
         [image release];
     }
 }
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 1901679..332b371 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -424,7 +424,7 @@
     [[[[self webFrame] webView] documentView] dataSourceUpdated:self];
 }
 
-- (void)receivedPageIcon:(NSImage *)image
+- (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)image;
 {
     [[_private->controller locationChangeHandler] receivedPageIcon:image forDataSource:self];
 }

-- 
WebKit Debian packaging