[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[gyuyoung.kim at samsung.com]

The following commit has been merged in the webkit-1.3 branch:
commit 78ca2f2845f4999abaf03abc8deb3c2190b8321d
Author: gyuyoung.kim at samsung.com <gyuyoung.kim at samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 12:42:44 2011 +0000

    2011-02-01  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Add an API to get proxy address.
            https://bugs.webkit.org/show_bug.cgi?id=52990
    
            Gets the proxy URI from network backend. This API returns a proxy URI
            which is set up by ewk_settings_proxy_uri_set(). But, it only implements
            this API for libsoup backend.
    
            * ewk/ewk_settings.cpp:
            (ewk_settings_proxy_uri_get):
            * ewk/ewk_settings.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
index d617048..a231837 100644
--- a/Source/WebKit/efl/ChangeLog
+++ b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,18 @@
+2011-02-01  Gyuyoung Kim  <gyuyoung.kim at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Add an API to get proxy address.
+        https://bugs.webkit.org/show_bug.cgi?id=52990
+
+        Gets the proxy URI from network backend. This API returns a proxy URI
+        which is set up by ewk_settings_proxy_uri_set(). But, it only implements
+        this API for libsoup backend.
+
+        * ewk/ewk_settings.cpp:
+        (ewk_settings_proxy_uri_get):
+        * ewk/ewk_settings.h:
+
 2011-01-29  Dan Winship  <danw at gnome.org>
 
         Reviewed by Xan Lopez.
diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp
index 20051ea..028a49a 100644
--- a/Source/WebKit/efl/ewk/ewk_settings.cpp
+++ b/Source/WebKit/efl/ewk/ewk_settings.cpp
@@ -291,6 +291,30 @@ void ewk_settings_proxy_uri_set(const char* proxy)
 }
 
 /**
+ * Gets the proxy URI from the network backend.
+ *
+ * @return current proxy URI or @c 0 if it's not set. 
+ */
+const char* ewk_settings_proxy_uri_get()
+{
+#if USE(SOUP)
+    SoupURI* uri;
+    SoupSession* session = WebCore::ResourceHandle::defaultSession();
+    g_object_get(session, SOUP_SESSION_PROXY_URI, &uri, NULL);
+
+    if (!uri) {
+        ERR("no proxy uri");
+        return 0;
+    }
+
+    WTF::String proxy = soup_uri_to_string(uri, EINA_FALSE);
+    return eina_stringshare_add(proxy.utf8().data());
+#elif USE(CURL)
+    EINA_SAFETY_ON_TRUE_RETURN(1);
+#endif
+}
+
+/**
 * @internal
 * Gets the default user agent string.
 *
diff --git a/Source/WebKit/efl/ewk/ewk_settings.h b/Source/WebKit/efl/ewk/ewk_settings.h
index 3c1668f..d1e12c0 100644
--- a/Source/WebKit/efl/ewk/ewk_settings.h
+++ b/Source/WebKit/efl/ewk/ewk_settings.h
@@ -49,6 +49,7 @@ EAPI cairo_surface_t *ewk_settings_icon_database_icon_surface_get(const char *ur
 EAPI Evas_Object     *ewk_settings_icon_database_icon_object_add(const char *url, Evas *canvas);
 
 EAPI void            ewk_settings_proxy_uri_set(const char* proxy);
+EAPI const char*     ewk_settings_proxy_uri_get();
 
 #ifdef __cplusplus
 }

-- 
WebKit Debian packaging