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

[darin]

The following commit has been merged in the debian/unstable branch:
commit e387f00289bf1dfb511b1b98253258968f69c9fa
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 22 22:44:21 2002 +0000

    WebKit:
    
            * Misc.subproj/WebKitErrors.h:
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    	Rename WebErrorLocationChangeInterruptedByURLPolicyChange to
    	WebErrorLocationChangeInterruptedByPolicyChange.
    
    WebBrowser:
    
            * LocationChangeHandler.m:
            (-[LocationChangeHandler locationChangeDone:forDataSource:]):
    	Rename WebErrorLocationChangeInterruptedByURLPolicyChange to
    	WebErrorLocationChangeInterruptedByPolicyChange.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2423 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ffc0a9f..8d83b35 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-10-22  Darin Adler  <darin at apple.com>
 
+        * Misc.subproj/WebKitErrors.h:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+	Rename WebErrorLocationChangeInterruptedByURLPolicyChange to
+	WebErrorLocationChangeInterruptedByPolicyChange.
+
+2002-10-22  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebMainResourceClient.m:
         (-[WebMainResourceClient handle:didReceiveResponse:]):
 	Send the new error whenever a policy change happens. The old code was
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ffc0a9f..8d83b35 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-10-22  Darin Adler  <darin at apple.com>
 
+        * Misc.subproj/WebKitErrors.h:
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+	Rename WebErrorLocationChangeInterruptedByURLPolicyChange to
+	WebErrorLocationChangeInterruptedByPolicyChange.
+
+2002-10-22  Darin Adler  <darin at apple.com>
+
         * WebView.subproj/WebMainResourceClient.m:
         (-[WebMainResourceClient handle:didReceiveResponse:]):
 	Send the new error whenever a policy change happens. The old code was
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index eee4c44..7cd014f 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -24,7 +24,7 @@ extern NSString *WebErrorDomainWebKit;
     @constant WebErrorCannotShowMIMEType
     @constant WebErrorCannotShowURL
     @constant WebErrorCannotNotFindApplicationForURL
-    @constant WebErrorLocationChangeInterruptedByURLPolicyChange
+    @constant WebErrorLocationChangeInterruptedByPolicyChange
 */
 enum {
     WebErrorCannotFindFile = 10000,
@@ -39,5 +39,5 @@ enum {
     WebErrorCannotShowMIMEType = 10009,
     WebErrorCannotShowURL = 10010,
     WebErrorCannotNotFindApplicationForURL = 10011,
-    WebErrorLocationChangeInterruptedByURLPolicyChange = 10012
+    WebErrorLocationChangeInterruptedByPolicyChange = 10012
 };
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index c9e7b8e..409e101 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -207,7 +207,7 @@
     if (![[dataSource webFrame] _shouldShowURL:URL]) {
         [handle cancel];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         result = nil;
     }
     else {
@@ -271,7 +271,7 @@
     case WebContentPolicySave:
     case WebContentPolicySaveAndOpenExternally:
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
         WebError *downloadError = [downloadHandler receivedResponse:response];
         [downloadProgressDelegate resource: identifier didReceiveResponse: response fromDataSource: dataSource];
@@ -285,7 +285,7 @@
         [handle cancel];
         [self didCancelWithHandle:handle];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         break;
     default:
         ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index c9e7b8e..409e101 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -207,7 +207,7 @@
     if (![[dataSource webFrame] _shouldShowURL:URL]) {
         [handle cancel];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         result = nil;
     }
     else {
@@ -271,7 +271,7 @@
     case WebContentPolicySave:
     case WebContentPolicySaveAndOpenExternally:
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         downloadHandler = [[WebDownloadHandler alloc] initWithDataSource:dataSource];
         WebError *downloadError = [downloadHandler receivedResponse:response];
         [downloadProgressDelegate resource: identifier didReceiveResponse: response fromDataSource: dataSource];
@@ -285,7 +285,7 @@
         [handle cancel];
         [self didCancelWithHandle:handle];
         [[dataSource webFrame] _setProvisionalDataSource:nil];
-	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByURLPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
+	[[[dataSource controller] locationChangeDelegate] locationChangeDone:[WebError errorWithCode:WebErrorLocationChangeInterruptedByPolicyChange inDomain:WebErrorDomainWebKit failingURL:nil] forDataSource:dataSource];
         break;
     default:
         ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");

-- 
WebKit Debian packaging