Merge lp:~gue5t/midori/bookmark-treeview-crash into lp:midori

[gue5t gue5t]

Limit bookmarks panel callbacks to the lifetime of the panel to fix a crash

Fix a crash caused by connecting signals on the app's bookmarks with bookmark panel as their data, but which were not limited to the lifetime of the bookmarks panel, so they would run even after it and its window had been closed, when opening another window.

[Cris Dywan (kalikiana)]

Nice!

review: Approve

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2015-02-24 18:18:08 +0000
+++ panels/midori-bookmarks.c	2015-08-08 17:24:03 +0000
@@ -831,17 +831,17 @@
     g_object_ref (app);
     bookmarks->bookmarks_db = katze_object_get_object (app, "bookmarks");
     midori_bookmarks_read_from_db_to_model (bookmarks, GTK_TREE_STORE (model), NULL, 0, NULL);
-    g_signal_connect_after (bookmarks->bookmarks_db, "add-item",
-                            G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks);
-    g_signal_connect_after (bookmarks->bookmarks_db, "update-item",
-                            G_CALLBACK (midori_bookmarks_update_item_cb), bookmarks);
-    g_signal_connect (bookmarks->bookmarks_db, "remove-item",
-                      G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks);
-    g_signal_connect (bookmarks->bookmarks_db, "update",
-                      G_CALLBACK (midori_bookmarks_update_cb), bookmarks);
-    g_signal_connect_after (model, "row-changed",
-                            G_CALLBACK (midori_bookmarks_row_changed_cb),
-                            bookmarks);
+    g_signal_connect_object (bookmarks->bookmarks_db, "add-item",
+                             G_CALLBACK (midori_bookmarks_add_item_cb), bookmarks, G_CONNECT_AFTER);
+    g_signal_connect_object (bookmarks->bookmarks_db, "update-item",
+                             G_CALLBACK (midori_bookmarks_update_item_cb), bookmarks, G_CONNECT_AFTER);
+    g_signal_connect_object (bookmarks->bookmarks_db, "remove-item",
+                             G_CALLBACK (midori_bookmarks_remove_item_cb), bookmarks, 0);
+    g_signal_connect_object (bookmarks->bookmarks_db, "update",
+                             G_CALLBACK (midori_bookmarks_update_cb), bookmarks, 0);
+    g_signal_connect_object (model, "row-changed",
+                             G_CALLBACK (midori_bookmarks_row_changed_cb),
+                             bookmarks, G_CONNECT_AFTER);
 }
 
 static void