Indentation in soup.c, domain.c, download.c, completion.c

1 files changed, 298 insertions, 248 deletions

diff --git a/src/soup.c b/src/soup.c
index 8ed21148..4ed8c3d2 100644
--- a/src/soup.c
+++ b/src/soup.c
@@ -29,338 +29,388 @@ static SoupCookieJar *m_pers_jar;
 
 /*{{{*/
 static void
-dwb_soup_clear_jar(SoupCookieJar *jar) {
-  GSList *all_cookies = soup_cookie_jar_all_cookies(jar);
-  for (GSList *l = all_cookies; l; l=l->next) {
-    soup_cookie_jar_delete_cookie(jar, l->data);
-  }
-  soup_cookies_free(all_cookies);
+dwb_soup_clear_jar(SoupCookieJar *jar) 
+{
+    GSList *all_cookies = soup_cookie_jar_all_cookies(jar);
+
+    for (GSList *l = all_cookies; l; l=l->next) 
+        soup_cookie_jar_delete_cookie(jar, l->data);
+
+    soup_cookies_free(all_cookies);
 }/*}}}*/
 
 /* dwb_soup_allow_cookie(GList *, const char, CookieStorePolicy) {{{*/
 static DwbStatus
-dwb_soup_allow_cookie_simple(GList **whitelist, const char *filename, CookieStorePolicy policy) {
-  GSList *list = domain_get_cookie_domains(CURRENT_WEBVIEW());
-  if (list == NULL)
-    return STATUS_ERROR;
-  for (GSList *l = list; l; l=l->next) {
-    char *domain = l->data;
-    if ( *whitelist == NULL || g_list_find_custom(*whitelist, domain, (GCompareFunc) g_strcmp0) == NULL ) {
-      if (dwb_confirm(dwb.state.fview, "Allow %s cookies for domain %s [y/n]", policy == COOKIE_ALLOW_PERSISTENT ? "persistent" : "session", domain)) {
-        *whitelist = g_list_append(*whitelist, g_strdup(domain));
-        util_file_add(filename, domain, true, -1);
-      }
+dwb_soup_allow_cookie_simple(GList **whitelist, const char *filename, CookieStorePolicy policy) 
+{
+    GSList *list = domain_get_cookie_domains(CURRENT_WEBVIEW());
+    char *domain;
+
+    if (list == NULL)
+        return STATUS_ERROR;
+
+    for (GSList *l = list; l; l=l->next) 
+    {
+        domain = l->data;
+        if ( *whitelist == NULL || g_list_find_custom(*whitelist, domain, (GCompareFunc) g_strcmp0) == NULL ) 
+        {
+            if (dwb_confirm(dwb.state.fview, "Allow %s cookies for domain %s [y/n]", policy == COOKIE_ALLOW_PERSISTENT ? "persistent" : "session", domain)) 
+            {
+                *whitelist = g_list_append(*whitelist, g_strdup(domain));
+                util_file_add(filename, domain, true, -1);
+            }
+        }
     }
-  }
-  CLEAR_COMMAND_TEXT();
-  /* Only the first domain ist allocated */
-  FREE0(list->data);
-  g_slist_free(list);
+    CLEAR_COMMAND_TEXT();
+
+    /* Only the first domain ist allocated */
+    FREE0(list->data);
+
+    g_slist_free(list);
 
-  return STATUS_OK;
+    return STATUS_OK;
 }
 const char *
-soup_get_header_from_request(WebKitNetworkRequest *request, const char *name) {
-  SoupMessage *msg = webkit_network_request_get_message(request);
-  if (msg != NULL) {
-    return soup_message_headers_get_one(msg->request_headers, name);
-  }
-  return NULL;
+soup_get_header_from_request(WebKitNetworkRequest *request, const char *name) 
+{
+    SoupMessage *msg = webkit_network_request_get_message(request);
+    if (msg != NULL) 
+        return soup_message_headers_get_one(msg->request_headers, name);
+
+    return NULL;
 }
 SoupMessage *
-dwb_soup_get_message(WebKitWebFrame *frame) {
-  WebKitWebDataSource *ds = webkit_web_frame_get_data_source(frame);
-  if (ds == NULL) 
-    return NULL;
-  WebKitNetworkRequest *request = webkit_web_data_source_get_request(ds);
-  if (request == NULL)
-    return NULL;
-  return webkit_network_request_get_message(request);
+dwb_soup_get_message(WebKitWebFrame *frame) 
+{
+    WebKitWebDataSource *ds = webkit_web_frame_get_data_source(frame);
+    if (ds == NULL) 
+        return NULL;
+    WebKitNetworkRequest *request = webkit_web_data_source_get_request(ds);
+    if (request == NULL)
+        return NULL;
+    return webkit_network_request_get_message(request);
 }
 const char *
-soup_get_header(GList *gl, const char *name) {
-  WebKitWebFrame *frame = webkit_web_view_get_main_frame(WEBVIEW(gl));
-  WebKitWebDataSource *data = webkit_web_frame_get_data_source(frame);
-  WebKitNetworkRequest *request = webkit_web_data_source_get_request(data);
-  return soup_get_header_from_request(request, name);
+soup_get_header(GList *gl, const char *name) 
+{
+    WebKitWebFrame *frame = webkit_web_view_get_main_frame(WEBVIEW(gl));
+    WebKitWebDataSource *data = webkit_web_frame_get_data_source(frame);
+    WebKitNetworkRequest *request = webkit_web_data_source_get_request(data);
+    return soup_get_header_from_request(request, name);
 }
 
 void
-dwb_soup_allow_cookie_tmp() {
-  GSList *last_cookies = domain_get_cookie_domains(CURRENT_WEBVIEW());
-  if (last_cookies == NULL)
-    return;
-  const char *domain;
-  for (GSList *l = last_cookies; l; l=l->next) {
-    domain = l->data;
-    if ( g_list_find_custom(dwb.fc.cookies_session_allow, domain, (GCompareFunc)g_strcmp0)  == NULL ) {
-      dwb.fc.cookies_session_allow = g_list_append(dwb.fc.cookies_session_allow, g_strdup(domain));
+dwb_soup_allow_cookie_tmp() 
+{
+    const char *domain;
+
+    GSList *last_cookies = domain_get_cookie_domains(CURRENT_WEBVIEW());
+    if (last_cookies == NULL)
+        return;
+
+    for (GSList *l = last_cookies; l; l=l->next) 
+    {
+        domain = l->data;
+        if ( g_list_find_custom(dwb.fc.cookies_session_allow, domain, (GCompareFunc)g_strcmp0)  == NULL ) 
+            dwb.fc.cookies_session_allow = g_list_append(dwb.fc.cookies_session_allow, g_strdup(domain));
     }
-  }
-  FREE0(last_cookies->data);
-  g_slist_free(last_cookies);
-  dwb_reload(dwb.state.fview);
+
+    dwb_reload(dwb.state.fview);
+
+    FREE0(last_cookies->data);
+    g_slist_free(last_cookies);
 }
 
 DwbStatus
-dwb_soup_allow_cookie(GList **whitelist, const char *filename, CookieStorePolicy policy) {
-  DwbStatus ret = STATUS_ERROR;
-
-  GSList *last_cookies = soup_cookie_jar_all_cookies(m_tmp_jar);
-  if (last_cookies == NULL) 
-    return dwb_soup_allow_cookie_simple(whitelist, filename, policy);
-
-  int length;
-  const char *domain;
-  SoupCookie *c;
-  GSList *asked = NULL, *allowed = NULL;
-
-  for (GSList *l = last_cookies; l; l=l->next) {
-    c = l->data;
-    domain = soup_cookie_get_domain(c);
-    if ( *whitelist == NULL || g_list_find_custom(*whitelist, domain, (GCompareFunc) g_strcmp0) == NULL ) {
-      /* only ask once, if it was already prompted for this domain and allowed it will be handled
-       * in the else clause */
-      if (g_slist_find_custom(asked, domain, (GCompareFunc)g_strcmp0))
-        continue;
-      if (dwb_confirm(dwb.state.fview, "Allow %s cookies for domain %s [y/n]", policy == COOKIE_ALLOW_PERSISTENT ? "persistent" : "session", domain)) {
-        *whitelist = g_list_append(*whitelist, g_strdup(domain));
-        util_file_add(filename, domain, true, -1);
-        allowed = g_slist_prepend(allowed, soup_cookie_copy(c));
-      }
-      asked = g_slist_prepend(asked, (char*)domain);
-      CLEAR_COMMAND_TEXT();
-    }
-    else {
-      allowed = g_slist_prepend(allowed, soup_cookie_copy(c));
+dwb_soup_allow_cookie(GList **whitelist, const char *filename, CookieStorePolicy policy) 
+{
+    DwbStatus ret = STATUS_ERROR;
+    int length;
+    const char *domain;
+    SoupCookie *c;
+    GSList *asked = NULL, *allowed = NULL;
+
+    GSList *last_cookies = soup_cookie_jar_all_cookies(m_tmp_jar);
+    if (last_cookies == NULL) 
+        return dwb_soup_allow_cookie_simple(whitelist, filename, policy);
+
+
+    for (GSList *l = last_cookies; l; l=l->next) 
+    {
+        c = l->data;
+        domain = soup_cookie_get_domain(c);
+        if ( *whitelist == NULL || g_list_find_custom(*whitelist, domain, (GCompareFunc) g_strcmp0) == NULL ) 
+        {
+            /* only ask once, if it was already prompted for this domain and allowed it will be handled
+             * in the else clause */
+            if (g_slist_find_custom(asked, domain, (GCompareFunc)g_strcmp0))
+                continue;
+
+            if (dwb_confirm(dwb.state.fview, "Allow %s cookies for domain %s [y/n]", policy == COOKIE_ALLOW_PERSISTENT ? "persistent" : "session", domain)) 
+            {
+                *whitelist = g_list_append(*whitelist, g_strdup(domain));
+                util_file_add(filename, domain, true, -1);
+                allowed = g_slist_prepend(allowed, soup_cookie_copy(c));
+            }
+            asked = g_slist_prepend(asked, (char*)domain);
+            CLEAR_COMMAND_TEXT();
+        }
+        else 
+            allowed = g_slist_prepend(allowed, soup_cookie_copy(c));
     }
-  }
-  length = g_slist_length(allowed);
-  if (length > 0) {
-    ret = STATUS_OK;
-  }
-  if (policy == COOKIE_STORE_PERSISTENT) 
-    dwb_soup_save_cookies(allowed);
-  /* Save all cookies to the jar */
-  for (GSList *l = allowed; l; l=l->next)
-    soup_cookie_jar_add_cookie(m_jar, l->data);
-  /* soup_cookie_jar_add_cookie steals the cookie, it must no be freed */
-  g_slist_free(allowed);
-
-  dwb_reload(dwb.state.fview);
-  g_slist_free(asked);
-  soup_cookies_free(last_cookies);
-  return ret;
+
+    length = g_slist_length(allowed);
+    if (length > 0) 
+        ret = STATUS_OK;
+
+    if (policy == COOKIE_STORE_PERSISTENT) 
+        dwb_soup_save_cookies(allowed);
+
+    /* Save all cookies to the jar */
+    for (GSList *l = allowed; l; l=l->next)
+        soup_cookie_jar_add_cookie(m_jar, l->data);
+
+    dwb_reload(dwb.state.fview);
+
+    /* soup_cookie_jar_add_cookie steals the cookie, it must no be freed */
+    g_slist_free(allowed);
+    g_slist_free(asked);
+    soup_cookies_free(last_cookies);
+    return ret;
 }/*}}}*/
 
 /* dwb_soup_clean() {{{*/
 void 
-dwb_soup_clean() {
-  dwb_soup_clear_jar(m_tmp_jar);
+dwb_soup_clean() 
+{
+    dwb_soup_clear_jar(m_tmp_jar);
 }/*}}}*/
 
 /* dwb_soup_get_host_from_request(WebKitNetworkRequest ) {{{*/
 const char *
-dwb_soup_get_host_from_request(WebKitNetworkRequest *request) {
-  const char *host = NULL;
-  SoupMessage *msg = webkit_network_request_get_message(request);
-  if (msg != NULL) {
-    SoupURI *suri = soup_message_get_uri(msg);
-    if (suri != NULL)
-      host = soup_uri_get_host(suri);
-  }
-  return host;
+dwb_soup_get_host_from_request(WebKitNetworkRequest *request) 
+{
+    const char *host = NULL;
+    SoupMessage *msg = webkit_network_request_get_message(request);
+    if (msg != NULL) 
+    {
+        SoupURI *suri = soup_message_get_uri(msg);
+        if (suri != NULL)
+            host = soup_uri_get_host(suri);
+    }
+    return host;
 }/*}}}*/
 
 /* dwb_soup_save_cookies(cookies) {{{*/
 void 
-dwb_soup_save_cookies(GSList *cookies) {
-  int fd = open(dwb.files[FILES_COOKIES], 0);
-  flock(fd, LOCK_EX);
-  SoupCookieJar *jar = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
-  for (GSList *l=cookies; l; l=l->next) {
-    soup_cookie_jar_add_cookie(jar, soup_cookie_copy(l->data));
-  }
-  g_object_unref(jar);
-  flock(fd, LOCK_UN);
-  close(fd);
+dwb_soup_save_cookies(GSList *cookies) 
+{
+    int fd = open(dwb.files[FILES_COOKIES], 0);
+    SoupCookieJar *jar;
+
+    flock(fd, LOCK_EX);
+    jar = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
+    for (GSList *l=cookies; l; l=l->next) 
+        soup_cookie_jar_add_cookie(jar, soup_cookie_copy(l->data));
+    g_object_unref(jar);
+
+    flock(fd, LOCK_UN);
+    close(fd);
 }/*}}}*/
 
 /* dwb_test_cookie_allowed(const char *)     return:  gboolean{{{*/
 static gboolean 
-dwb_soup_test_cookie_allowed(GList *list, SoupCookie *cookie) {
-  g_return_val_if_fail(cookie != NULL, false);
-  g_return_val_if_fail(cookie->domain != NULL, false);
-  for (GList *l = list; l; l=l->next) {
-    if (l->data && soup_cookie_domain_matches(cookie, l->data)) {
-      return true;
+dwb_soup_test_cookie_allowed(GList *list, SoupCookie *cookie) 
+{
+    g_return_val_if_fail(cookie != NULL, false);
+    g_return_val_if_fail(cookie->domain != NULL, false);
+    for (GList *l = list; l; l=l->next) 
+    {
+        if (l->data && soup_cookie_domain_matches(cookie, l->data)) 
+            return true;
     }
-  }
-  return false;
+    return false;
 }/*}}}*/
 
 /* dwb_soup_set_cookie_accept_policy {{{*/
 DwbStatus 
-dwb_soup_set_cookie_accept_policy(const char *policy) {
-  SoupCookieJarAcceptPolicy apo = 37;
-  DwbStatus ret = STATUS_OK;
-  if (policy == NULL || ! g_ascii_strcasecmp(policy, "always")) 
-    apo = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
-  if (! g_ascii_strcasecmp(policy, "nothirdparty"))
-    apo = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
-  else if (! g_ascii_strcasecmp(policy, "never"))
-    apo = SOUP_COOKIE_JAR_ACCEPT_NEVER;
-
-  if (apo == 37) {
-    dwb_set_error_message(dwb.state.fview, "Invalid value for cookies-accept-policy: %d, using 0", policy);
-    apo = 0;
-    ret = STATUS_ERROR;
-  }
-  soup_cookie_jar_set_accept_policy(m_jar, apo);
-  return ret;
+dwb_soup_set_cookie_accept_policy(const char *policy) 
+{
+    SoupCookieJarAcceptPolicy apo = 37;
+    DwbStatus ret = STATUS_OK;
+    if (policy == NULL || ! g_ascii_strcasecmp(policy, "always")) 
+        apo = SOUP_COOKIE_JAR_ACCEPT_ALWAYS;
+
+    if (! g_ascii_strcasecmp(policy, "nothirdparty"))
+        apo = SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY;
+    else if (! g_ascii_strcasecmp(policy, "never"))
+        apo = SOUP_COOKIE_JAR_ACCEPT_NEVER;
+
+    if (apo == 37) 
+    {
+        dwb_set_error_message(dwb.state.fview, "Invalid value for cookies-accept-policy: %d, using 0", policy);
+        apo = 0;
+        ret = STATUS_ERROR;
+    }
+    soup_cookie_jar_set_accept_policy(m_jar, apo);
+    return ret;
 }/*}}}*/
 
 /* dwb_soup_get_cookie_store_policy(const char *policy) {{{*/
 CookieStorePolicy 
-dwb_soup_get_cookie_store_policy(const char *policy) {
-  if (policy == NULL)
-    return COOKIE_STORE_SESSION;
-  if (! g_ascii_strcasecmp(policy, "persistent")) 
-    return COOKIE_STORE_PERSISTENT;
-  else if (! g_ascii_strcasecmp(policy, "never")) 
-    return COOKIE_STORE_NEVER;
-  else
-    return COOKIE_STORE_SESSION;
+dwb_soup_get_cookie_store_policy(const char *policy) 
+{
+    if (policy == NULL)
+        return COOKIE_STORE_SESSION;
+    if (! g_ascii_strcasecmp(policy, "persistent")) 
+        return COOKIE_STORE_PERSISTENT;
+    else if (! g_ascii_strcasecmp(policy, "never")) 
+        return COOKIE_STORE_NEVER;
+    else
+        return COOKIE_STORE_SESSION;
 }/*}}}*/
 
 /*dwb_soup_cookie_changed_cb {{{*/
 static void 
-dwb_soup_cookie_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, gpointer *p) {
-  //SoupCookieJar *j = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
-  if (old) {
-    soup_cookie_jar_delete_cookie(m_pers_jar, old);
-  }
-  if (new) {
-    if (dwb.state.cookie_store_policy == COOKIE_STORE_PERSISTENT || dwb_soup_test_cookie_allowed(dwb.fc.cookies_allow, new)) {
-      soup_cookie_jar_add_cookie(m_pers_jar, soup_cookie_copy(new));
-    }
-    else { 
-      soup_cookie_jar_add_cookie(m_tmp_jar, soup_cookie_copy(new));
-      if (dwb.state.cookie_store_policy == COOKIE_STORE_NEVER && !dwb_soup_test_cookie_allowed(dwb.fc.cookies_session_allow, new) ) {
-        g_signal_handler_block(jar, m_changed_id);
-        soup_cookie_jar_delete_cookie(jar, new);
-        g_signal_handler_unblock(jar, m_changed_id);
-      }
+dwb_soup_cookie_changed_cb(SoupCookieJar *jar, SoupCookie *old, SoupCookie *new, gpointer *p) 
+{
+    //SoupCookieJar *j = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
+    if (old) 
+        soup_cookie_jar_delete_cookie(m_pers_jar, old);
+    if (new) 
+    {
+        if (dwb.state.cookie_store_policy == COOKIE_STORE_PERSISTENT || dwb_soup_test_cookie_allowed(dwb.fc.cookies_allow, new)) 
+            soup_cookie_jar_add_cookie(m_pers_jar, soup_cookie_copy(new));
+        else 
+        { 
+            soup_cookie_jar_add_cookie(m_tmp_jar, soup_cookie_copy(new));
+            if (dwb.state.cookie_store_policy == COOKIE_STORE_NEVER && !dwb_soup_test_cookie_allowed(dwb.fc.cookies_session_allow, new) ) 
+            {
+                g_signal_handler_block(jar, m_changed_id);
+                soup_cookie_jar_delete_cookie(jar, new);
+                g_signal_handler_unblock(jar, m_changed_id);
+            }
+        }
     }
-  }
 }/*}}}*/
 
 void
-dwb_soup_sync_cookies() {
-  int fd = open(dwb.files[FILES_COOKIES], 0);
-  flock(fd, LOCK_EX);
-  GSList *all_cookies = soup_cookie_jar_all_cookies(m_pers_jar);
-  SoupCookieJar *j = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
-  for (GSList *l = all_cookies; l; l=l->next) {
-    soup_cookie_jar_add_cookie(j, l->data);
-  }
-  g_slist_free(all_cookies);
-  g_object_unref(j);
-  flock(fd, LOCK_UN);
-  close(fd);
+dwb_soup_sync_cookies() 
+{
+    int fd = open(dwb.files[FILES_COOKIES], 0);
+    flock(fd, LOCK_EX);
+
+    GSList *all_cookies = soup_cookie_jar_all_cookies(m_pers_jar);
+    SoupCookieJar *j = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], false);
+    for (GSList *l = all_cookies; l; l=l->next) 
+        soup_cookie_jar_add_cookie(j, l->data);
+
+    g_slist_free(all_cookies);
+    g_object_unref(j);
+
+    flock(fd, LOCK_UN);
+    close(fd);
 }
 
 void 
-dwb_soup_clear_cookies() {
-  dwb_soup_clear_jar(m_tmp_jar);
-  dwb_soup_clear_jar(m_pers_jar);
-  dwb_soup_clear_jar(m_jar);
+dwb_soup_clear_cookies() 
+{
+    dwb_soup_clear_jar(m_tmp_jar);
+    dwb_soup_clear_jar(m_pers_jar);
+    dwb_soup_clear_jar(m_jar);
 }
 
 /* dwb_soup_init_cookies {{{*/
 void
-dwb_soup_init_cookies(SoupSession *s) {
-  m_jar = soup_cookie_jar_new(); 
-  m_tmp_jar = soup_cookie_jar_new();
-  //m_pers_jar = soup_cookie_jar_new();
-  m_pers_jar = soup_cookie_jar_new();
-  dwb_soup_set_cookie_accept_policy(GET_CHAR("cookies-accept-policy"));
-  SoupCookieJar *old_cookies = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], true);
-  GSList *l = soup_cookie_jar_all_cookies(old_cookies);
-  for (; l; l=l->next ) {
-    soup_cookie_jar_add_cookie(m_jar, soup_cookie_copy(l->data)); 
-  }
-  soup_cookies_free(l);
-  g_object_unref(old_cookies);
-  soup_session_add_feature(s, SOUP_SESSION_FEATURE(m_jar));
-  m_changed_id = g_signal_connect(m_jar, "changed", G_CALLBACK(dwb_soup_cookie_changed_cb), NULL);
+dwb_soup_init_cookies(SoupSession *s) 
+{
+    m_jar = soup_cookie_jar_new(); 
+    m_tmp_jar = soup_cookie_jar_new();
+    //m_pers_jar = soup_cookie_jar_new();
+    m_pers_jar = soup_cookie_jar_new();
+
+    dwb_soup_set_cookie_accept_policy(GET_CHAR("cookies-accept-policy"));
+    SoupCookieJar *old_cookies = soup_cookie_jar_text_new(dwb.files[FILES_COOKIES], true);
+
+    GSList *l = soup_cookie_jar_all_cookies(old_cookies);
+    for (; l; l=l->next ) 
+        soup_cookie_jar_add_cookie(m_jar, soup_cookie_copy(l->data)); 
+
+    soup_cookies_free(l);
+    g_object_unref(old_cookies);
+
+    soup_session_add_feature(s, SOUP_SESSION_FEATURE(m_jar));
+    m_changed_id = g_signal_connect(m_jar, "changed", G_CALLBACK(dwb_soup_cookie_changed_cb), NULL);
 }/*}}}*/
 
 /* dwb_init_proxy{{{*/
 void 
-dwb_soup_init_proxy() {
-  const char *proxy;
-  gboolean use_proxy = GET_BOOL("proxy");
-  if ( !(proxy =  g_getenv("http_proxy")) && !(proxy =  GET_CHAR("proxy-url")) )
-    return;
+dwb_soup_init_proxy() 
+{
+    const char *proxy;
+    gboolean use_proxy = GET_BOOL("proxy");
+    if ( !(proxy =  g_getenv("http_proxy")) && !(proxy =  GET_CHAR("proxy-url")) )
+        return;
 
-  if (dwb.misc.proxyuri)
-    g_free(dwb.misc.proxyuri);
+    if (dwb.misc.proxyuri)
+        g_free(dwb.misc.proxyuri);
 
-  dwb.misc.proxyuri = g_strrstr(proxy, "://") ? g_strdup(proxy) : g_strdup_printf("http://%s", proxy);
-  SoupURI *uri = soup_uri_new(dwb.misc.proxyuri);
-  g_object_set(dwb.misc.soupsession, "proxy-uri", use_proxy ? uri : NULL, NULL); 
-  soup_uri_free(uri);
+    dwb.misc.proxyuri = g_strrstr(proxy, "://") ? g_strdup(proxy) : g_strdup_printf("http://%s", proxy);
+    SoupURI *uri = soup_uri_new(dwb.misc.proxyuri);
+    g_object_set(dwb.misc.soupsession, "proxy-uri", use_proxy ? uri : NULL, NULL); 
+    soup_uri_free(uri);
 }/*}}}*/
 
 void
-dwb_soup_set_ntlm(gboolean use_ntlm) {
-  if (use_ntlm) 
-    soup_session_add_feature_by_type(dwb.misc.soupsession, SOUP_TYPE_AUTH_NTLM);
-  else 
-    soup_session_remove_feature_by_type(dwb.misc.soupsession, SOUP_TYPE_AUTH_NTLM);
+dwb_soup_set_ntlm(gboolean use_ntlm) 
+{
+    if (use_ntlm) 
+        soup_session_add_feature_by_type(dwb.misc.soupsession, SOUP_TYPE_AUTH_NTLM);
+    else 
+        soup_session_remove_feature_by_type(dwb.misc.soupsession, SOUP_TYPE_AUTH_NTLM);
 }
 
 /* dwb_soup_init_session_features() {{{*/
 DwbStatus 
-dwb_soup_init_session_features() {
+dwb_soup_init_session_features() 
+{
 #ifdef WITH_LIBSOUP_2_38
-  gboolean cert = GET_BOOL("ssl-use-system-ca-file");
-  g_object_set(dwb.misc.soupsession, 
-      SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, cert, NULL);
-#else 
-  char *cert = GET_CHAR("ssl-ca-cert");
-  if (cert != NULL && g_file_test(cert, G_FILE_TEST_EXISTS)) {
+    gboolean cert = GET_BOOL("ssl-use-system-ca-file");
     g_object_set(dwb.misc.soupsession, 
-        SOUP_SESSION_SSL_CA_FILE, cert, NULL);
-  }
+            SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, cert, NULL);
+#else 
+    char *cert = GET_CHAR("ssl-ca-cert");
+    if (cert != NULL && g_file_test(cert, G_FILE_TEST_EXISTS)) 
+    {
+        g_object_set(dwb.misc.soupsession, 
+                SOUP_SESSION_SSL_CA_FILE, cert, NULL);
+    }
 #endif
-  g_object_set(dwb.misc.soupsession, SOUP_SESSION_SSL_STRICT, GET_BOOL("ssl-strict"), NULL);
-  dwb_soup_set_ntlm(GET_BOOL("use-ntlm"));
-  return STATUS_OK;
-  //soup_session_add_feature_by_type(dwb.misc.soupsession, SOUP_TYPE_AUTH_NTLM);
-  //soup_session_add_feature(dwb.misc.soupsession, SOUP_SESSION_FEATURE(soup_content_sniffer_new()));
-  //soup_session_add_feature_by_type(webkit_get_default_session(), SOUP_TYPE_CONTENT_SNIFFER);
+    g_object_set(dwb.misc.soupsession, SOUP_SESSION_SSL_STRICT, GET_BOOL("ssl-strict"), NULL);
+    dwb_soup_set_ntlm(GET_BOOL("use-ntlm"));
+    return STATUS_OK;
 }/*}}}*/
 
 /* dwb_soup_end(() {{{*/
 void
-dwb_soup_end() {
-  g_object_unref(m_tmp_jar);
-  g_object_unref(m_jar);
-  g_object_unref(m_pers_jar);
-  g_free(dwb.misc.proxyuri);
+dwb_soup_end() 
+{
+    g_object_unref(m_tmp_jar);
+    g_object_unref(m_jar);
+    g_object_unref(m_pers_jar);
+    g_free(dwb.misc.proxyuri);
 }/*}}}*/
 
 /* dwb_soup_init() {{{*/
 void 
-dwb_soup_init() {
-  dwb.misc.soupsession = webkit_get_default_session();
-  dwb_soup_init_proxy();
-  dwb_soup_init_cookies(dwb.misc.soupsession);
-  dwb_soup_init_session_features();
+dwb_soup_init() 
+{
+    dwb.misc.soupsession = webkit_get_default_session();
+    dwb_soup_init_proxy();
+    dwb_soup_init_cookies(dwb.misc.soupsession);
+    dwb_soup_init_session_features();
 #if 0
-  SoupLogger *sl = soup_logger_new(SOUP_LOGGER_LOG_BODY, -1);
-  soup_session_add_feature(dwb.misc.soupsession, sl);
+    SoupLogger *sl = soup_logger_new(SOUP_LOGGER_LOG_BODY, -1);
+    soup_session_add_feature(dwb.misc.soupsession, sl);
 #endif
 }/*}}}*/