[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit b795c124e115701ec723be556d656b0f57f09cfd
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 17:44:56 2009 +0000

            SnowLeopard build fix.
    
            Renamed initWithClient to initWithAuthenticationClient.
    
            * platform/network/mac/AuthenticationMac.mm:
            (-[WebCoreAuthenticationClientAsChallengeSender initWithAuthenticationClient:]):
            (WebCore::AuthenticationChallenge::setAuthenticationClient):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50884 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfae672..c2a5496 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-12  Alexey Proskuryakov  <ap at apple.com>
+
+        SnowLeopard build fix.
+
+        Renamed initWithClient to initWithAuthenticationClient.
+
+        * platform/network/mac/AuthenticationMac.mm:
+        (-[WebCoreAuthenticationClientAsChallengeSender initWithAuthenticationClient:]):
+        (WebCore::AuthenticationChallenge::setAuthenticationClient):
+
 2009-11-12  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/mac/AuthenticationMac.mm b/WebCore/platform/network/mac/AuthenticationMac.mm
index 58022f7..60c998c 100644
--- a/WebCore/platform/network/mac/AuthenticationMac.mm
+++ b/WebCore/platform/network/mac/AuthenticationMac.mm
@@ -40,13 +40,13 @@ using namespace WebCore;
 {
     AuthenticationClient* m_client;
 }
-- (id)initWithClient:(AuthenticationClient*)client;
+- (id)initWithAuthenticationClient:(AuthenticationClient*)client;
 - (void)detachClient;
 @end
 
 @implementation WebCoreAuthenticationClientAsChallengeSender
 
-- (id)initWithClient:(AuthenticationClient*)client
+- (id)initWithAuthenticationClient:(AuthenticationClient*)client
 {
     self = [self init];
     if (!self)
@@ -109,7 +109,7 @@ AuthenticationChallenge::AuthenticationChallenge(NSURLAuthenticationChallenge *c
 void AuthenticationChallenge::setAuthenticationClient(AuthenticationClient* client)
 {
     if (client) {
-        m_sender.adoptNS([[WebCoreAuthenticationClientAsChallengeSender alloc] initWithClient:client]);
+        m_sender.adoptNS([[WebCoreAuthenticationClientAsChallengeSender alloc] initWithAuthenticationClient:client]);
         m_nsChallenge.adoptNS([[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:m_nsChallenge.get() sender:m_sender.get()]);
     } else {
         if ([m_sender.get() isMemberOfClass:[WebCoreAuthenticationClientAsChallengeSender class]])

-- 
WebKit Debian packaging