[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 61220c9706b5b1e32870305131b6a6ec4ec4906c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 03:04:54 2003 +0000

    WebFoundation:
    
            Reviewed by Richard.
    
    	Moved NSURLProtectionSpace over to officially blessed API.
    
            * AuthenticationManager.subproj/NSHTTPAuthenticator.m:
            (-[NSHTTPAuthenticator _protectionSpaceForURL:realm:]):
            (-[NSHTTPAuthenticator _usernameForRealm:URL:]):
            (-[NSHTTPAuthenticator _proxyProtectionSpaceForURL:]):
            (-[NSHTTPAuthenticator _askDelegateWithURL:realm:forRequest:failureCount:failureResponse:protocol:withCallback:context:]):
            (-[NSHTTPAuthenticator _setDefaultUserInfoFromURL:]):
            (-[NSHTTPAuthenticator _removePasswordForRealm:URL:]):
            * AuthenticationManager.subproj/NSURLProtectionSpace.h:
            * AuthenticationManager.subproj/NSURLProtectionSpace.m:
            (-[NSURLProtectionSpaceInternal dealloc]):
            (-[NSURLProtectionSpace _internalInit]):
            (-[NSURLProtectionSpace initWithHost:port:protocol:realm:authenticationMethod:]):
            (-[NSURLProtectionSpace initWithProxyHost:port:type:realm:authenticationMethod:]):
            (-[NSURLProtectionSpace dealloc]):
            (-[NSURLProtectionSpace realm]):
            (-[NSURLProtectionSpace receivesCredentialSecurely]):
            (-[NSURLProtectionSpace isProxy]):
            (-[NSURLProtectionSpace host]):
            (-[NSURLProtectionSpace port]):
            (-[NSURLProtectionSpace proxyType]):
            (-[NSURLProtectionSpace hash]):
            (-[NSURLProtectionSpace isEqual:]):
            (-[NSURLProtectionSpace authenticationMethod]):
            (-[NSURLProtectionSpace protocol]):
            * AuthenticationManager.subproj/WebCredentialStorage.m:
            (-[WebCredentialStorage _protectionSpaceWithKeychainItem:isDefault:]):
            (-[WebCredentialStorage _secProtocolForProtectionSpace:]):
            (-[WebCredentialStorage _saveCredential:forProtectionSpace:isDefault:]):
            (-[WebCredentialStorage _addKeychainItem:]):
            (-[WebCredentialStorage credentialsForProtectionSpace:]):
            (-[WebCredentialStorage addCredential:forProtectionSpace:]):
            (-[WebCredentialStorage removeCredential:forProtectionSpace:]):
            (-[WebCredentialStorage defaultCredentialForProtectionSpace:]):
            (-[WebCredentialStorage setDefaultCredential:forProtectionSpace:]):
    
    WebKit:
    
            Reviewed by Richard.
    
    	Moved NSURLProtectionSpace over to officially blessed API.
    
            * Panels.subproj/WebAuthenticationPanel.m:
            (-[WebAuthenticationPanel setUpForChallenge:]):
    
    WebBrowser:
    
            Reviewed by Richard.
    
    	Moved NSURLProtectionSpace over to officially blessed API.
    
            * FormCompletionController.m:
            (protectionSpaceFromFrame):
            * Preferences.subproj/PasswordsEditor.m:
            (-[PasswordsEditor addressStringForCredential:]):
            (-[PasswordsEditor resetCredentials]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4237 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94b3d50..36ca65b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-30  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	Moved NSURLProtectionSpace over to officially blessed API.
+	
+        * Panels.subproj/WebAuthenticationPanel.m:
+        (-[WebAuthenticationPanel setUpForChallenge:]):
+
 2003-04-30  Richard Williamson   <rjw at apple.com>
 
         Copy MIME type when copying WebDataProtocol's parameters.
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index ded0b2f..ab73ad1 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -109,7 +109,7 @@
         if ([space isProxy]) {
             message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to the %@ proxy server %@.",
                                                            "prompt string in authentication panel"),
-                [space type], host];
+                [space proxyType], host];
         } else {
             message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to area “%@” on %@.",
                                                            "prompt string in authentication panel"),
@@ -119,7 +119,7 @@
         if ([space isProxy]) {
             message = [NSString stringWithFormat:UI_STRING("The name or password entered for the %@ proxy server %@ was incorrect. Please try again.",
                                                            "prompt string in authentication panel"),
-				[space type], host];
+				[space proxyType], host];
         } else {
             message = [NSString stringWithFormat:UI_STRING("The name or password entered for area “%@” on %@ was incorrect. Please try again.",
                                                            "prompt string in authentication panel"),

-- 
WebKit Debian packaging