Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2005-04-29 08:43:08 (GMT)
committer Marco Pesenti Gritti <marco@src.gnome.org>2005-04-29 08:43:08 (GMT)
commitc057cade000e7e71c7af4f34ac86c96dfd52f526 (patch)
treef8df144f032ad72ffed559d12275be69cb20fe55 /shell
parent2579c79ae8e8396e890e58a8df86317d23972902 (diff)
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.
Diffstat (limited to 'shell')
-rw-r--r--shell/ev-page-action.c9
-rw-r--r--shell/ev-window.c15
2 files changed, 10 insertions, 14 deletions
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;
}
diff --git a/shell/ev-window.c b/shell/ev-window.c
index ad2e19a..471a45d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1181,11 +1181,6 @@ destroy_fullscreen_popup (EvWindow *window)
{
if (window->priv->fullscreen_popup != NULL)
{
- /* FIXME multihead */
- g_signal_handlers_disconnect_by_func
- (gdk_screen_get_default (),
- G_CALLBACK (screen_size_changed_cb), window);
-
gtk_widget_destroy (window->priv->fullscreen_popup);
window->priv->fullscreen_popup = NULL;
}
@@ -1321,10 +1316,12 @@ ev_window_create_fullscreen_popup (EvWindow *window)
gtk_window_set_resizable (GTK_WINDOW (popup), FALSE);
/* FIXME multihead */
- g_signal_connect (gdk_screen_get_default (), "size-changed",
- G_CALLBACK (screen_size_changed_cb), window);
- g_signal_connect (popup, "size_request",
- G_CALLBACK (fullscreen_popup_size_request_cb), window);
+ g_signal_connect_object (gdk_screen_get_default (), "size-changed",
+ G_CALLBACK (screen_size_changed_cb),
+ window, 0);
+ g_signal_connect_object (popup, "size_request",
+ G_CALLBACK (fullscreen_popup_size_request_cb),
+ window, 0);
return popup;
}