aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/callbacks.c
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2010-10-31 18:29:33 -0600
committerGravatar Brendan Taylor <whateley@gmail.com>2010-10-31 18:29:33 -0600
commit4b9a31cbdb60d0877ae365efa8cff43fe943b983 (patch)
treedc7a0bb4fcc8fe59e8d52f2619908082c511b34a /src/callbacks.c
parent3e5d1a08a4c722a6e4f8dd77a75f9239baa1b674 (diff)
parent877e5dace26fd6482f56f211082492eac48cc588 (diff)
Merge branch 'dev/cookie-jar-fixes'
Conflicts: src/callbacks.c src/callbacks.h src/cookie-jar.c
Diffstat (limited to 'src/callbacks.c')
-rw-r--r--src/callbacks.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index e0c2c0c..aea5c43 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -882,5 +882,10 @@ populate_popup_cb(WebKitWebView *v, GtkMenu *m, void *c) {
void
cmd_set_cookie_handler() {
+ if(uzbl.behave.cookie_handler[0] == 0) {
+ g_free(uzbl.behave.cookie_handler);
+ uzbl.behave.cookie_handler = NULL;
+ }
+
uzbl_cookie_jar_set_handler(uzbl.net.soup_cookie_jar, uzbl.behave.cookie_handler);
}