[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 6bc9b1236320a0183d24a2b28fd4fb0402d9f322
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Apr 12 01:17:58 2003 +0000

    WebKit:
    
    	Removed WebKitErrorResourceLoadInterruptedByPolicyChange error because it isn't used.
    
            Reviewed by john.
    
            * Misc.subproj/WebKitErrors.h:
            * Misc.subproj/WebKitErrors.m:
            (registerErrors):
            * WebKit.pbproj/project.pbxproj:
    
    WebBrowser:
    
    	Fixed: 3109110 - clean up status bar after deciding to download
    	Fixed: 3090317 - Download progress feedback very bad after drag & drop .dmg URL to Alex
    
            Reviewed by trey, john.
    
            * BrowserWebErrorExtras.h:
            * BrowserWebErrorExtras.m:
            (-[WebError isCancelledError]): new
            (-[WebError isPolicyChangeError]): new
            * FrameProgressEntry.m:
            (-[FrameProgressEntry stage]): use new error categories
            * LoadProgressMonitor.h:
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor reset]): new, set main entry to nil if we haven't previously committed
            (-[LoadProgressMonitor committedFrame:]): set committed bool
            * LocationChangeHandler.m:
            (-[LocationChangeHandler webView:locationChangeDone:forDataSource:]): call [LoadProgressMonitor reset] for downloads
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4085 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e44ff96..2899fab 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-11  Chris Blumenberg  <cblu at apple.com>
+
+	Removed WebKitErrorResourceLoadInterruptedByPolicyChange error because it isn't used. 
+
+        Reviewed by john.
+
+        * Misc.subproj/WebKitErrors.h:
+        * Misc.subproj/WebKitErrors.m:
+        (registerErrors):
+        * WebKit.pbproj/project.pbxproj:
+
 2003-04-11  Trey Matteson  <trey at apple.com>
 
 	3148002 - printing shouldn't depend on the size of the window
diff --git a/WebKit/Misc.subproj/WebKitErrors.h b/WebKit/Misc.subproj/WebKitErrors.h
index f91338c..b786bbb 100644
--- a/WebKit/Misc.subproj/WebKitErrors.h
+++ b/WebKit/Misc.subproj/WebKitErrors.h
@@ -40,7 +40,6 @@ enum {
     WebKitErrorCannotShowMIMEType = 				100,
     WebKitErrorCannotShowURL = 					101,
     WebKitErrorLocationChangeInterruptedByPolicyChange = 	102,
-    WebKitErrorResourceLoadInterruptedByPolicyChange = 		103,
 };
 
 /*!
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index b516610..f633337 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -30,6 +30,8 @@ NSString *WebErrorDomainWebKit = @"WebErrorDomainWebKit";
 #define WebKitErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebKitErrorCannotShowMIMEType description")
 #define WebKitErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebKitErrorCannotShowURL description")
 #define WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange UI_STRING("Location change interrupted", "WebKitErrorLocationChangeInterruptedByPolicyChange description")
+
+// FIXME: Delete this error once localization is unfrozen. It isn't used.
 #define WebKitErrorDescriptionResourceLoadInterruptedByPolicyChange UI_STRING("Resource load interrupted", "WebKitErrorResourceLoadInterruptedByPolicyChange description")
 
 // Plug-in and java errors
@@ -79,7 +81,6 @@ static void registerErrors()
         WebKitErrorDescriptionCannotShowMIMEType, 		[NSNumber numberWithInt: WebKitErrorCannotShowMIMEType],
         WebKitErrorDescriptionCannotShowURL, 			[NSNumber numberWithInt: WebKitErrorCannotShowURL],
         WebKitErrorDescriptionLocationChangeInterruptedByPolicyChange, 	[NSNumber numberWithInt: WebKitErrorLocationChangeInterruptedByPolicyChange],
-        WebKitErrorDescriptionResourceLoadInterruptedByPolicyChange,  	[NSNumber numberWithInt: WebKitErrorResourceLoadInterruptedByPolicyChange],
 
         // Plug-in and java errors
         WebKitErrorDescriptionWebErrorCannotFindPlugin,		[NSNumber numberWithInt: WebKitErrorCannotFindPlugin],

-- 
WebKit Debian packaging