[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 1e2cf4f2717d1f1c4770941e0b66c972b031d5ce
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 23 22:25:07 2002 +0000

    WebKit:
            * WebKit.pbproj/project.pbxproj:
    
            Took IFDownloadHandler.h out of the public headers.
    
            * WebView.subproj/IFLocationChangeHandler.h:
    
            Removed deprecated methods.
    
            * WebView.subproj/IFWebFrame.mm:
            (-[IFWebFrame setProvisionalDataSource:]):
    
            Don't call locationChangeStarted anymore.
    
    WebBrowser:
            * LocationChangeHandler.m:
    
            Removed locationChangeStarted and downloadingWithHandler as they are
            deprecated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 85b019d..1c87d8d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,20 @@
 2002-04-23  Chris Blumenberg  <cblu at apple.com>
 
+	* WebKit.pbproj/project.pbxproj:
+
+	Took IFDownloadHandler.h out of the public headers.
+
+	* WebView.subproj/IFLocationChangeHandler.h:
+
+	Removed deprecated methods.
+
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame setProvisionalDataSource:]):
+
+	Don't call locationChangeStarted anymore.
+
+2002-04-23  Chris Blumenberg  <cblu at apple.com>
+
 	* MIME.subproj/IFDownloadHandler.h:
 	* MIME.subproj/IFDownloadHandler.m: Removed.
 	* MIME.subproj/IFDownloadHandler.mm: Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 85b019d..1c87d8d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,20 @@
 2002-04-23  Chris Blumenberg  <cblu at apple.com>
 
+	* WebKit.pbproj/project.pbxproj:
+
+	Took IFDownloadHandler.h out of the public headers.
+
+	* WebView.subproj/IFLocationChangeHandler.h:
+
+	Removed deprecated methods.
+
+	* WebView.subproj/IFWebFrame.mm:
+	(-[IFWebFrame setProvisionalDataSource:]):
+
+	Don't call locationChangeStarted anymore.
+
+2002-04-23  Chris Blumenberg  <cblu at apple.com>
+
 	* MIME.subproj/IFDownloadHandler.h:
 	* MIME.subproj/IFDownloadHandler.m: Removed.
 	* MIME.subproj/IFDownloadHandler.mm: Added.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 2b8e859..88d079b 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1123,7 +1123,6 @@
 			isa = PBXBuildFile;
 			settings = {
 				ATTRIBUTES = (
-					Public,
 				);
 			};
 		};
diff --git a/WebKit/WebView.subproj/IFLocationChangeHandler.h b/WebKit/WebView.subproj/IFLocationChangeHandler.h
index 417466f..6c1ff4c 100644
--- a/WebKit/WebView.subproj/IFLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/IFLocationChangeHandler.h
@@ -46,11 +46,6 @@ typedef enum {
 
 @protocol IFLocationChangeHandler
 
-// DEPRECATED
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-// DEPRECATED 
-- (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
-
 - (void)locationChangeStarted;
 
 // Sent after locationChangeStarted.
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 38c3106..83792c1 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -113,10 +113,7 @@
     }
     
     locationChangeHandler = [[self controller] provideLocationChangeHandlerForFrame: self];
-    if (newDataSource != nil && locationChangeHandler != nil){
-        if (![locationChangeHandler locationWillChangeTo: [newDataSource inputURL]])
-            return NO;
-    }
+
     [newDataSource _setLocationChangeHandler: locationChangeHandler];
 
     oldDataSource = [self dataSource];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 38c3106..83792c1 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -113,10 +113,7 @@
     }
     
     locationChangeHandler = [[self controller] provideLocationChangeHandlerForFrame: self];
-    if (newDataSource != nil && locationChangeHandler != nil){
-        if (![locationChangeHandler locationWillChangeTo: [newDataSource inputURL]])
-            return NO;
-    }
+
     [newDataSource _setLocationChangeHandler: locationChangeHandler];
 
     oldDataSource = [self dataSource];
diff --git a/WebKit/WebView.subproj/WebFrameLoadDelegate.h b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
index 417466f..6c1ff4c 100644
--- a/WebKit/WebView.subproj/WebFrameLoadDelegate.h
+++ b/WebKit/WebView.subproj/WebFrameLoadDelegate.h
@@ -46,11 +46,6 @@ typedef enum {
 
 @protocol IFLocationChangeHandler
 
-// DEPRECATED
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-// DEPRECATED 
-- (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
-
 - (void)locationChangeStarted;
 
 // Sent after locationChangeStarted.
diff --git a/WebKit/WebView.subproj/WebLocationChangeDelegate.h b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
index 417466f..6c1ff4c 100644
--- a/WebKit/WebView.subproj/WebLocationChangeDelegate.h
+++ b/WebKit/WebView.subproj/WebLocationChangeDelegate.h
@@ -46,11 +46,6 @@ typedef enum {
 
 @protocol IFLocationChangeHandler
 
-// DEPRECATED
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-// DEPRECATED 
-- (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
-
 - (void)locationChangeStarted;
 
 // Sent after locationChangeStarted.
diff --git a/WebKit/WebView.subproj/WebLocationChangeHandler.h b/WebKit/WebView.subproj/WebLocationChangeHandler.h
index 417466f..6c1ff4c 100644
--- a/WebKit/WebView.subproj/WebLocationChangeHandler.h
+++ b/WebKit/WebView.subproj/WebLocationChangeHandler.h
@@ -46,11 +46,6 @@ typedef enum {
 
 @protocol IFLocationChangeHandler
 
-// DEPRECATED
-- (BOOL)locationWillChangeTo: (NSURL *)url;
-// DEPRECATED 
-- (void) downloadingWithHandler:(IFDownloadHandler *)downloadHandler;
-
 - (void)locationChangeStarted;
 
 // Sent after locationChangeStarted.

-- 
WebKit Debian packaging