[Xfce4-commits] <midori:master> Remove cookie feature after running cleanup callbacks

[Christian Dywan]

Updating branch refs/heads/master
         to e4d03290d3ebb5db327d164458252bd3f8c510d8 (commit)
       from bac3dc1842d98c5f42f1b8b576531c55f8b7cb41 (commit)

commit e4d03290d3ebb5db327d164458252bd3f8c510d8
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Wed Sep 21 23:07:53 2011 +0200

    Remove cookie feature after running cleanup callbacks

 midori/main.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 0230e49..0a4fa70 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2544,9 +2544,6 @@ main (int    argc,
 
     g_object_get (settings, "maximum-history-age", &max_history_age, NULL);
     midori_history_terminate (history, max_history_age);
-    /* Removing KatzeHttpCookies makes it save outstanding changes */
-    soup_session_remove_feature_by_type (webkit_get_default_session (),
-                                         KATZE_TYPE_HTTP_COOKIES);
 
     /* Clear data on quit, according to the Clear private data dialog */
     g_object_get (settings, "clear-private-data", &clear_prefs, NULL);
@@ -2568,6 +2565,10 @@ main (int    argc,
         g_free (clear_data);
     }
 
+    /* Removing KatzeHttpCookies makes it save outstanding changes */
+    soup_session_remove_feature_by_type (webkit_get_default_session (),
+                                         KATZE_TYPE_HTTP_COOKIES);
+
     load_on_startup = katze_object_get_int (settings, "load-on-startup");
     if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES)
     {