4 files changed, 27 insertions, 8 deletions

diff --git a/Source/WebKit/efl/ewk/ewk_cookies.cpp b/Source/WebKit/efl/ewk/ewk_cookies.cpp
index 421f8dc..2564fc7 100644
--- a/Source/WebKit/efl/ewk/ewk_cookies.cpp
+++ b/Source/WebKit/efl/ewk/ewk_cookies.cpp
@@ -57,9 +57,7 @@ EAPI Eina_Bool ewk_cookies_file_set(const char *filename)
     if (!cookieJar)
         return EINA_FALSE;
 
-#ifdef HAVE_LIBSOUP_2_29_90
     soup_cookie_jar_set_accept_policy(cookieJar, SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
-#endif
 
     SoupSession* session = WebCore::ResourceHandle::defaultSession();
     SoupSessionFeature* oldjar = soup_session_get_feature(session, SOUP_TYPE_COOKIE_JAR);
@@ -187,7 +185,6 @@ EAPI void ewk_cookies_cookie_free(Ewk_Cookie *cookie)
 EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
 {
 #ifdef WTF_USE_SOUP
-#ifdef HAVE_LIBSOUP_2_29_90
     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
     SoupCookieJarAcceptPolicy policy;
 
@@ -206,7 +203,6 @@ EAPI void ewk_cookies_policy_set(Ewk_Cookie_Policy p)
 
     soup_cookie_jar_set_accept_policy(cookieJar, policy);
 #endif
-#endif
 }
 
 /*
@@ -218,7 +214,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
 {
     Ewk_Cookie_Policy ewk_policy = EWK_COOKIE_JAR_ACCEPT_ALWAYS;
 #ifdef WTF_USE_SOUP
-#ifdef HAVE_LIBSOUP_2_29_90
     SoupCookieJar* cookieJar = WebCore::defaultCookieJar();
     SoupCookieJarAcceptPolicy policy;
 
@@ -235,7 +230,6 @@ EAPI Ewk_Cookie_Policy ewk_cookies_policy_get()
         break;
     }
 #endif
-#endif
 
     return ewk_policy;
 }
diff --git a/Source/WebKit/efl/ewk/ewk_frame.cpp b/Source/WebKit/efl/ewk/ewk_frame.cpp
index f41caae..1a159c5 100644
--- a/Source/WebKit/efl/ewk/ewk_frame.cpp
+++ b/Source/WebKit/efl/ewk/ewk_frame.cpp
@@ -1681,7 +1681,7 @@ Evas_Object* ewk_frame_child_add(Evas_Object* o, WTF::PassRefPtr<WebCore::Frame>
     if (!cf->page())
         goto died;
 
-    cf->loader()->loadURLIntoChildFrame(url, referrer, cf);
+    sd->frame->loader()->loadURLIntoChildFrame(url, referrer, cf);
     if (!cf->tree()->parent())
         goto died;
 
@@ -2008,7 +2008,7 @@ Eina_Bool ewk_frame_uri_changed(Evas_Object* o)
 {
     EWK_FRAME_SD_GET_OR_RETURN(o, sd, EINA_FALSE);
     EINA_SAFETY_ON_NULL_RETURN_VAL(sd->frame, EINA_FALSE);
-    WTF::CString uri(sd->frame->loader()->url().prettyURL().utf8());
+    WTF::CString uri(sd->frame->document()->url().prettyURL().utf8());
 
     INF("uri=%s", uri.data());
     if (!uri.data()) {
diff --git a/Source/WebKit/efl/ewk/ewk_settings.cpp b/Source/WebKit/efl/ewk/ewk_settings.cpp
index 20051ea..54e6645 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_VAL(1, NULL);
+#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
 }