[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 f02e1ae57e32ae5ac10eef0ccd6b6ceb8f565873
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 25 21:22:56 2003 +0000

            Reviewed by John.
    
    	- fixed 3280582 - REGRESSION (74-85): authentication sheet doesn't state that previous login was incorrect
    
            * Panels.subproj/WebAuthenticationPanel.m:
            (-[WebAuthenticationPanel setUpForChallenge:]): Use chall, the
    	parameter, not challenge, the not-yet-set ivar so we get the right
    	failure count &c.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ca3c3f3..dfbebcc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-25  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3280582 - REGRESSION (74-85): authentication sheet doesn't state that previous login was incorrect
+
+        * Panels.subproj/WebAuthenticationPanel.m:
+        (-[WebAuthenticationPanel setUpForChallenge:]): Use chall, the
+	parameter, not challenge, the not-yet-set ivar so we get the right
+	failure count &c.
+
 2003-07-25  Richard Williamson   <rjw at apple.com>
 
 	Use 11 point bold, instead of 12 point bold to draw dragged link
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index d8def6c..354297d 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -106,7 +106,7 @@
     NSString *realm = [space realm];
     NSString *message;
 
-    if ([challenge previousFailureCount] == 0) {
+    if ([chall previousFailureCount] == 0) {
         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"),
@@ -141,8 +141,8 @@
                 "message in authentication panel")];
     }
 
-    if ([[challenge proposedCredential] user] != nil) {
-        [username setStringValue:[[challenge proposedCredential] user]];
+    if ([[chall proposedCredential] user] != nil) {
+        [username setStringValue:[[chall proposedCredential] user]];
         [panel setInitialFirstResponder:password];
     } else {
         [username setStringValue:@""];

-- 
WebKit Debian packaging