summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgue5t <gue5t@midori.launchpad>2015-08-08 12:16:30 -0500
committergue5t <gue5t@midori.launchpad>2015-08-08 12:16:30 -0500
commitdc81af7199ef4f7f64ceb1ab401f3bbf94b48234 (patch)
tree016364bbc0260e5261887e536c3737e851615987
parent1164627b2580cbf6ffd379d92ff19b3da7912ed0 (diff)
downloadmidori-dc81af7199ef4f7f64ceb1ab401f3bbf94b48234.tar.gz
Limit bookmarks panel callbacks to the lifetime of the panel to fix a crash
-rw-r--r--panels/midori-bookmarks.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index a237f9a7..41e3a469 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -831,17 +831,17 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
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