summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgue5t <gue5t@midori.launchpad>2015-08-10 00:31:37 +0000
committerRabbitBot <>2015-08-10 00:31:37 +0000
commit441738b7af5883fc92e0026272d5f3160186c45e (patch)
tree67fafcb98dbe95e58f87d5294168cdd9c2bffabb
parentee5bd1470b9e1d975c82cf67cfa160aea71ae636 (diff)
parentdc81af7199ef4f7f64ceb1ab401f3bbf94b48234 (diff)
downloadmidori-441738b7af5883fc92e0026272d5f3160186c45e.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 62905a52..6909a1c6 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