From: Daniel Carl <danielcarl@gmx.de>
Date: Thu, 1 Nov 2012 18:48:33 +0000 (+0100)
Subject: Fixed missed flags to disable cookie support.
X-Git-Url: https://git.owens.tech/assets/favicon.png/assets/favicon.png/git?a=commitdiff_plain;h=2722058dbcbc54fc848ecb3341179eef359ed725;p=vimb.git

Fixed missed flags to disable cookie support.
---

diff --git a/src/main.c b/src/main.c
index 86fadeb..437568a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -536,8 +536,6 @@ static void vp_setup_signals(void)
     g_signal_connect(G_OBJECT(frame), "scrollbars-policy-changed", G_CALLBACK(vp_frame_scrollbar_policy_changed_cb), NULL);
     g_signal_connect(G_OBJECT(gui->webview), "notify::load-status", G_CALLBACK(vp_webview_load_status_cb), NULL);
     g_signal_connect(G_OBJECT(gui->webview), "load-committed", G_CALLBACK(vp_webview_load_commited_cb), NULL);
-    g_object_set(vp.net.soup_session, "max-conns", SETTING_MAX_CONNS , NULL);
-    g_object_set(vp.net.soup_session, "max-conns-per-host", SETTING_MAX_CONNS_PER_HOST, NULL);
 
     g_object_connect(
         G_OBJECT(gui->inputbox),
@@ -547,6 +545,8 @@ static void vp_setup_signals(void)
         NULL
     );
 #ifdef FEATURE_COOKIE
+    g_object_set(vp.net.soup_session, "max-conns", SETTING_MAX_CONNS , NULL);
+    g_object_set(vp.net.soup_session, "max-conns-per-host", SETTING_MAX_CONNS_PER_HOST, NULL);
     g_signal_connect_after(G_OBJECT(vp.net.soup_session), "request-started", G_CALLBACK(vp_new_request_cb), NULL);
 #endif
 }
diff --git a/src/main.h b/src/main.h
index 898bf2f..33c50f8 100644
--- a/src/main.h
+++ b/src/main.h
@@ -153,7 +153,9 @@ typedef struct {
 } Network;
 
 typedef struct {
+#ifdef FEATURE_COOKIE
     time_t cookie_timeout;
+#endif
     gint   scrollstep;
     gchar* status_color_bg;
     gchar* status_color_fg;
diff --git a/src/setting.c b/src/setting.c
index e5ec019..3ece1e6 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -21,7 +21,9 @@
 #include "util.h"
 
 static gboolean setting_webkit(const Setting* s);
+#ifdef FEATURE_COOKIE
 static gboolean setting_cookie_timeout(const Setting* s);
+#endif
 static gboolean setting_scrollstep(const Setting* s);
 static gboolean setting_status_color_bg(const Setting* s);
 static gboolean setting_status_color_fg(const Setting* s);
@@ -74,7 +76,9 @@ static Setting default_settings[] = {
     {"user-stylesheet-uri", TYPE_CHAR, setting_webkit, {.s = NULL}},
     {"zoom-step", TYPE_DOUBLE, setting_webkit, {.i = 100}},
     /* internal variables */
+#ifdef FEATURE_COOKIE
     {"cookie-timeout", TYPE_INTEGER, setting_cookie_timeout, {.i = 4800}},
+#endif
     {"scrollstep", TYPE_INTEGER, setting_scrollstep, {.i = 40}},
     {"status-color-bg", TYPE_CHAR, setting_status_color_bg, {.s = "#000"}},
     {"status-color-fg", TYPE_CHAR, setting_status_color_fg, {.s = "#fff"}},
@@ -163,12 +167,14 @@ static gboolean setting_webkit(const Setting* s)
     return TRUE;
 }
 
+#ifdef FEATURE_COOKIE
 static gboolean setting_cookie_timeout(const Setting* s)
 {
     vp.config.cookie_timeout = s->arg.i;
 
     return TRUE;
 }
+#endif
 
 static gboolean setting_scrollstep(const Setting* s)
 {
diff --git a/vimp_dbg b/vimp_dbg
deleted file mode 100755
index 2b0117b..0000000
Binary files a/vimp_dbg and /dev/null differ