From 8f2f4ca2a8a122acea79599886d69505d3d8007c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 2 Sep 2013 12:26:38 +0100 Subject: Use new cookie manager. --- content/urldb.c | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) (limited to 'content') diff --git a/content/urldb.c b/content/urldb.c index feb7c6f81..0dbb392fb 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -2542,12 +2542,7 @@ char *urldb_get_cookie(nsurl *url, bool include_http_only) c->last_used = now; - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update( - (struct cookie_data *)c); - else - cookie_manager_add( - (struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } } } @@ -2583,12 +2578,7 @@ char *urldb_get_cookie(nsurl *url, bool include_http_only) c->last_used = now; - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update( - (struct cookie_data *)c); - else - cookie_manager_add( - (struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } } @@ -2632,11 +2622,7 @@ char *urldb_get_cookie(nsurl *url, bool include_http_only) c->last_used = now; - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update( - (struct cookie_data *)c); - else - cookie_manager_add((struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } } @@ -2670,11 +2656,7 @@ char *urldb_get_cookie(nsurl *url, bool include_http_only) c->last_used = now; - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update( - (struct cookie_data *)c); - else - cookie_manager_add((struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } } @@ -3429,10 +3411,7 @@ bool urldb_insert_cookie(struct cookie_internal_data *c, lwc_string *scheme, else p->cookies = d->next; - if (nsoption_bool(temp_treeview_test) == false) - cookies_remove((struct cookie_data *)d); - else - cookie_manager_remove((struct cookie_data *)d); + cookie_manager_remove((struct cookie_data *)d); urldb_free_cookie(d); urldb_free_cookie(c); @@ -3449,17 +3428,10 @@ bool urldb_insert_cookie(struct cookie_internal_data *c, lwc_string *scheme, else p->cookies = c; - if (nsoption_bool(temp_treeview_test) == false) - cookies_remove((struct cookie_data *)d); - else - cookie_manager_remove((struct cookie_data *)d); + cookie_manager_remove((struct cookie_data *)d); urldb_free_cookie(d); - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update( - (struct cookie_data *)c); - else - cookie_manager_add((struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } } else { c->prev = p->cookies_end; @@ -3470,10 +3442,7 @@ bool urldb_insert_cookie(struct cookie_internal_data *c, lwc_string *scheme, p->cookies = c; p->cookies_end = c; - if (nsoption_bool(temp_treeview_test) == false) - cookies_schedule_update((struct cookie_data *)c); - else - cookie_manager_add((struct cookie_data *)c); + cookie_manager_add((struct cookie_data *)c); } return true; -- cgit v1.2.3