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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 5876984cd30e2104deab7ed580d3d89ba4cbdf95
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 23:11:51 2002 +0000

            Removed vestigal locationChangeHandler ivar.
    
            * WebView.subproj/WebDataSourcePrivate.h:
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _loadIcon]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d69fa7b..f1c6581 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Removed vestigal locationChangeHandler ivar.
+        
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]):
+
 2002-07-24  Chris Blumenberg  <cblu at apple.com>
 
 	Call [self _locationChangeHandler] instead of _private-locationChangeHandler
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d69fa7b..f1c6581 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-07-24  Richard Williamson (Local)  <rjw at apple.com>
+
+        Removed vestigal locationChangeHandler ivar.
+        
+        * WebView.subproj/WebDataSourcePrivate.h:
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]):
+
 2002-07-24  Chris Blumenberg  <cblu at apple.com>
 
 	Call [self _locationChangeHandler] instead of _private-locationChangeHandler
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index bb30849..46e261d 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -62,9 +62,6 @@
     // Error associated with main document.
     WebError *mainDocumentError;
 
-    // The location change handler for this data source.
-    id <WebLocationChangeHandler>locationChangeHandler;
-
     WebContentPolicy contentPolicy;
 
     BOOL loading; // self and controller are retained while loading
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index bd1b6ce..41d4df8 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -484,7 +484,7 @@
     
             if([dataSourceURL isFileURL]){
                 NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[dataSourceURL path]];
-                [_private->locationChangeHandler receivedPageIcon:icon forDataSource:self];
+                [[self _locationChangeHandler] receivedPageIcon:icon forDataSource:self];
             } else {
                 _private->iconURL = [[NSURL _web_URLWithString:@"/favicon.ico" relativeToURL:dataSourceURL] retain];
             }

-- 
WebKit Debian packaging