[Xfce4-commits] <midori:master> Only re-attach KatzeHttpCookies if it existed before

[Christian Dywan]

Updating branch refs/heads/master
         to 064ac4418b293635dcf4a04c7d3928059a98ba59 (commit)
       from 949f38fb58f32e3525832bf246307e9d1c92f609 (commit)

commit 064ac4418b293635dcf4a04c7d3928059a98ba59
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Oct 29 22:27:42 2010 +0200

    Only re-attach KatzeHttpCookies if it existed before

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

diff --git a/midori/main.c b/midori/main.c
index 45fb906..74adc15 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1581,8 +1581,11 @@ midori_clear_web_cookies_cb (void)
     }
     g_slist_free (cookies);
     /* Removing KatzeHttpCookies makes it save outstanding changes */
-    soup_session_remove_feature_by_type (session, KATZE_TYPE_HTTP_COOKIES);
-    soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_COOKIES);
+    if (soup_session_get_feature (session, KATZE_TYPE_HTTP_COOKIES))
+    {
+        soup_session_remove_feature_by_type (session, KATZE_TYPE_HTTP_COOKIES);
+        soup_session_add_feature_by_type (session, KATZE_TYPE_HTTP_COOKIES);
+    }
 }
 
 #ifdef GDK_WINDOWING_X11