From d7a918c152c2ce626db79ff2ac62b5bc207ffb02 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Sun, 11 Nov 2012 14:26:39 +0100
Subject: [PATCH] Removed line that caused a soup waring.

It seems that the removing of the soup feature 'soup_cookie_get_type' isn't
required.
---
 src/completion.c | 8 ++++----
 src/main.c       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/completion.c b/src/completion.c
index 166e173..4565507 100644
--- a/src/completion.c
+++ b/src/completion.c
@@ -158,12 +158,12 @@ static GList* completion_update(GList* completion, GList* active, gboolean back)
             gtk_widget_hide(c->event);
         } else if (position == 1) {
             int i = 0;
-            for (GList *l = g_list_first(completion); l && i<max; l=l->next, i++) {
+            for (GList *l = g_list_first(completion); l && i < max; l = l->next, i++) {
                 gtk_widget_hide(((Completion*)l->data)->event);
             }
             gtk_widget_show(vp.gui.compbox);
             i = 0;
-            for (GList *l = g_list_last(completion); l && i<max ;l=l->prev, i++) {
+            for (GList *l = g_list_last(completion); l && i < max; l = l->prev, i++) {
                 c = l->data;
                 gtk_widget_show_all(c->event);
             }
@@ -179,12 +179,12 @@ static GList* completion_update(GList* completion, GList* active, gboolean back)
             gtk_widget_show_all(c->event);
         } else if (position == items || position  == 1) {
             int i = 0;
-            for (GList *l = g_list_last(completion); l && i<max; l=l->prev) {
+            for (GList *l = g_list_last(completion); l && i < max; l = l->prev) {
                 gtk_widget_hide(((Completion*)l->data)->event);
             }
             gtk_widget_show(vp.gui.compbox);
             i = 0;
-            for (GList *l = g_list_first(completion); l && i<max ;l=l->next, i++) {
+            for (GList *l = g_list_first(completion); l && i < max; l = l->next, i++) {
                 gtk_widget_show_all(((Completion*)l->data)->event);
             }
         }
diff --git a/src/main.c b/src/main.c
index 02dfc09..9651963 100644
--- a/src/main.c
+++ b/src/main.c
@@ -248,6 +248,7 @@ void vp_clean_up(void)
     command_cleanup();
     setting_cleanup();
     keybind_cleanup();
+    completion_clean();
 }
 
 static gboolean vp_hide_message(void)
@@ -444,7 +445,6 @@ static void vp_init_gui(void)
     /* init soup session */
 #ifdef FEATURE_COOKIE
     vp.net.soup_session = webkit_get_default_session();
-    soup_session_remove_feature_by_type(vp.net.soup_session, soup_cookie_get_type());
     soup_session_remove_feature_by_type(vp.net.soup_session, soup_cookie_jar_get_type());
 #endif
 
-- 
2.20.1