cleaned up the set_proxy_url function

1 files changed, 9 insertions, 13 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index 3c0eaba..fe6b8fd 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -12,21 +12,17 @@
 
 void
 set_proxy_url() {
-    SoupURI *suri;
+    const gchar *url = uzbl.net.proxy_url;
+    SoupSession *session  = uzbl.net.soup_session;
+    SoupURI     *soup_uri = NULL;
 
-    if (uzbl.net.proxy_url == NULL || *uzbl.net.proxy_url == ' ') {
-        soup_session_remove_feature_by_type(uzbl.net.soup_session,
-                (GType) SOUP_SESSION_PROXY_URI);
-    }
-    else {
-        suri = soup_uri_new(uzbl.net.proxy_url);
-        g_object_set(G_OBJECT(uzbl.net.soup_session),
-                SOUP_SESSION_PROXY_URI,
-                suri, NULL);
-        soup_uri_free(suri);
-    }
+    if (url != NULL || *url != 0 || *url != ' ')
+        soup_uri = soup_uri_new(url);
 
-    return;
+    g_object_set(G_OBJECT(session), SOUP_SESSION_PROXY_URI, soup_uri, NULL);
+
+    if(soup_uri)
+        soup_uri_free(soup_uri);
 }