From 070543d8c2e39b9680af03eeea0c7248dfb8dc83 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Thu, 2 Jan 2003 16:54:56 +0000 Subject: (e_signal_connect_full_while_alive): Get to compile. (e_signal_connect_while_alive): Like. svn path=/trunk/; revision=19201 --- e-util/ChangeLog | 6 ++++++ e-util/e-gtk-utils.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 20d2b13a30..495144e4b8 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2003-01-02 Ettore Perazzoli + + * e-gtk-utils.c (e_signal_connect_full_while_alive): Get to + compile. + (e_signal_connect_while_alive): Like. + 2002-12-19 Ettore Perazzoli * e-gtk-utils.c (e_signal_connect_while_alive): New. diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c index 161a74ae45..1f5aefe3ca 100644 --- a/e-util/e-gtk-utils.c +++ b/e-util/e-gtk-utils.c @@ -49,7 +49,7 @@ e_signal_connect_while_alive (void *instance, closure = g_cclosure_new (callback, callback_data, NULL); g_object_watch_closure (alive_instance, closure); - g_signal_connect_closure_by_id (instance, g_signal_lookup (name, G_OBJECT_TYPE (object)), 0, + g_signal_connect_closure_by_id (instance, g_signal_lookup (name, G_OBJECT_TYPE (instance)), 0, closure, FALSE); } @@ -103,7 +103,7 @@ e_signal_connect_full_while_alive (void *instance, GtkCallbackMarshal marshal, void *data, GtkDestroyNotify destroy_func, - gboolean object_signal, + gboolean instance_signal, gboolean after, void *alive_instance) { @@ -125,7 +125,7 @@ e_signal_connect_full_while_alive (void *instance, info->disconnect_handler1 = gtk_signal_connect (instance, "destroy", GTK_SIGNAL_FUNC (alive_disconnecter), info); - info->object2 = alive_object; + info->object2 = alive_instance; info->disconnect_handler2 = gtk_signal_connect (alive_instance, "destroy", GTK_SIGNAL_FUNC (alive_disconnecter), info); } -- cgit v1.2.3