[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 7f92337e9342d4e8e3fa04889fadef7550d9532f
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 23:04:26 2010 +0000

    2010-10-14  Andreas Kling  <kling at webkit.org>
    
            Fix GTK+ build after r69808.
    
            * GNUmakefile.am:
            * platform/network/curl/ProxyServerCurl.cpp:
            (WebCore::proxyServersForURL):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69815 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 48914a8..4a6cb43 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-14  Andreas Kling  <kling at webkit.org>
+
+        Fix GTK+ build after r69808.
+
+        * GNUmakefile.am:
+        * platform/network/curl/ProxyServerCurl.cpp:
+        (WebCore::proxyServersForURL):
+
 2010-10-14  Simon Fraser  <simon.fraser at apple.com>
 
         Another build fix. Export FrameLoader::networkingContext()
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index b13a890..58ada25 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2376,6 +2376,8 @@ webcore_sources += \
 	WebCore/platform/network/HTTPParsers.cpp \
 	WebCore/platform/network/HTTPParsers.h \
 	WebCore/platform/network/NetworkingContext.h \
+	WebCore/platform/network/ProxyServer.cpp \
+	WebCore/platform/network/ProxyServer.h \
 	WebCore/platform/network/NetworkStateNotifier.cpp \
 	WebCore/platform/network/NetworkStateNotifier.h \
 	WebCore/platform/network/ProtectionSpace.cpp \
diff --git a/WebCore/platform/network/curl/ProxyServerCurl.cpp b/WebCore/platform/network/curl/ProxyServerCurl.cpp
index 768dd83..212768a 100644
--- a/WebCore/platform/network/curl/ProxyServerCurl.cpp
+++ b/WebCore/platform/network/curl/ProxyServerCurl.cpp
@@ -31,7 +31,7 @@
 
 namespace WebCore {
 
-Vector<ProxyServer> proxyServersForURL(const KURL&)
+Vector<ProxyServer> proxyServersForURL(const KURL&, const NetworkingContext*)
 {
     // FIXME: Implement.
     return Vector<ProxyServer>();

-- 
WebKit Debian packaging