summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2013-01-16 05:44:47 -0800
committerDan Nicholson <dbn.lists@gmail.com>2013-01-19 16:05:18 -0800
commit227961f9b900e35b28b9fe03e8ec81f7c4ee1a57 (patch)
treea1afa13ff08168899ce7b31ce8e650e07ffbb7a8
parent70899f8fa6a88c2c7198fc87a39518a7f932ae28 (diff)
ev-page-action-widget: Use g_signal_connect instead of g_signal_connect_object
g_signal_connect_object has been finally fixed in recent versions of glib, so the signal is disconnected when the object is disposed. However we are manually disconnecting the signal handler, which gives a runtime warning with recent glib versions because the signal has already been disconnected. Use g_signal_connect() and keep disocnnecting the signal manually to make sure it still works with previous versions of glib. This is upstream evince commit 30f23d6.
-rw-r--r--src/ev-page-action-widget.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ev-page-action-widget.c b/src/ev-page-action-widget.c
index 2bc74e6..311c442 100644
--- a/src/ev-page-action-widget.c
+++ b/src/ev-page-action-widget.c
@@ -210,10 +210,10 @@ ev_page_action_widget_document_changed_cb (EvDocumentModel *model,
action_widget->signal_id = 0;
}
action_widget->signal_id =
- g_signal_connect_object (action_widget->doc_model,
- "page-changed",
- G_CALLBACK (page_changed_cb),
- action_widget, 0);
+ g_signal_connect (action_widget->doc_model,
+ "page-changed",
+ G_CALLBACK (page_changed_cb),
+ action_widget);
ev_page_action_widget_set_current_page (action_widget,
ev_document_model_get_page (model));