From c057cade000e7e71c7af4f34ac86c96dfd52f526 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 29 Apr 2005 08:43:08 +0000
Subject: Use connect_object rather than explicitly disconnect on dispose.

2005-04-29  Marco Pesenti Gritti  <mpg@redhat.com>

        * shell/ev-page-action.c: (update_page_cache),
        (ev_page_action_dispose):
        * shell/ev-window.c: (destroy_fullscreen_popup),
        (ev_window_create_fullscreen_popup):

        Use connect_object rather than explicitly
        disconnect on dispose.
---
(limited to 'shell/ev-page-action.c')

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 78e2570..deb9b77 100644
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -197,10 +197,10 @@ update_page_cache (EvPageAction *page, GParamSpec *pspec, EvPageActionWidget *pr
 		g_signal_handler_disconnect (proxy->page_cache, proxy->signal_id);
 	
 	if (page_cache != NULL) {
-		signal_id = g_signal_connect (page_cache,
-					      "page-changed",
-					      G_CALLBACK (page_changed_cb),
-					      proxy);
+		signal_id = g_signal_connect_object (page_cache,
+					             "page-changed",
+					             G_CALLBACK (page_changed_cb),
+					             proxy, 0);
 		/* Set the initial value */
 		page_changed_cb (page_cache,
 				 ev_page_cache_get_current_page (page_cache),
@@ -419,7 +419,6 @@ ev_page_action_dispose (GObject *object)
 	EvPageAction *page = EV_PAGE_ACTION (object);
 
 	if (page->priv->page_cache) {
-		g_signal_handlers_disconnect_matched (page->priv->page_cache, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, page_changed_cb, NULL);
 		g_object_unref (page->priv->page_cache);
 		page->priv->page_cache = NULL;
 	}
--
cgit v0.9.1