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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit e1c516e8703a5783bdad5f047d1d0bafe9ec8cf5
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 13 20:04:56 2003 +0000

    WebFoundation:
    
    	API CHANGE
    
            Reviewed by Darin.
    
    	- renamed NSErrorFailingURLKey to NSErrorFailingURLStringKey
    	- removed NSURLCFStreamErrorDomain
    
            * Misc.subproj/NSURLError.h:
            * Misc.subproj/WebNSErrorExtras.m:
            (-[NSError _web_initWithDomain:code:failingURL:]):
            (-[NSError _web_failingURL]):
            * WebFoundation-base.exp:
    
    WebKit:
    
            Reviewed by Darin.
    
    	- renamed NSErrorFailingURLKey to NSErrorFailingURLStringKey
    
            * Misc.subproj/WebKitErrors.m:
            (-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
    
    WebBrowser:
    
            Reviewed by Darin.
    
    	- renamed NSErrorFailingURLKey to NSErrorFailingURLStringKey
    
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor webView:plugInFailedWithError:dataSource:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4360 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 163b5f4..3c31d1d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-05-13  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- renamed NSErrorFailingURLKey to NSErrorFailingURLStringKey
+
+        * Misc.subproj/WebKitErrors.m:
+        (-[NSError _initWithPluginErrorCode:contentURLString:pluginPageURLString:pluginName:MIMEType:]):
+
 2003-05-13  John Sullivan  <sullivan at apple.com>
 
 	fixed build break
diff --git a/WebKit/Misc.subproj/WebKitErrors.m b/WebKit/Misc.subproj/WebKitErrors.m
index a715fbd..2161b51 100644
--- a/WebKit/Misc.subproj/WebKitErrors.m
+++ b/WebKit/Misc.subproj/WebKitErrors.m
@@ -58,7 +58,7 @@ static void registerErrors(void);
     
     NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
     if (contentURLString) {
-        [userInfo setObject:contentURLString forKey:NSErrorFailingURLKey];
+        [userInfo setObject:contentURLString forKey:NSErrorFailingURLStringKey];
     }
     if (pluginPageURLString) {
         [userInfo setObject:pluginPageURLString forKey:WebKitErrorPlugInPageURLStringKey];

-- 
WebKit Debian packaging