Updating branch refs/heads/master
         to c9e1c7cd5f90765634bafb555ffb464ba08eca83 (commit)
       from fd15e8e34153b3ee10d73f0dfe471267725b1fe1 (commit)

commit c9e1c7cd5f90765634bafb555ffb464ba08eca83
Author: Christian Dywan <christ...@twotoasts.de>
Date:   Sun Mar 10 23:40:34 2013 +0100

    Allow any proxies supported by libproxy
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1153332

 midori/midori-session.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/midori/midori-session.c b/midori/midori-session.c
index 55dd878..5808f0d 100644
--- a/midori/midori-session.c
+++ b/midori/midori-session.c
@@ -32,8 +32,12 @@ midori_soup_session_set_proxy_uri (SoupSession* session,
     SoupURI* proxy_uri;
 
     /* soup_uri_new expects a non-NULL string with a protocol */
-    if (midori_uri_is_http (uri))
+    gchar* scheme = uri ? g_uri_parse_scheme (uri): NULL;
+    if (scheme)
+    {
         proxy_uri = soup_uri_new (uri);
+        g_free (scheme);
+    }
     else if (uri && *uri)
     {
         gchar* fixed_uri = g_strconcat ("http://";, uri, NULL);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

Reply via email to