aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-01-03 00:54:56 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-01-03 00:54:56 +0800
commit070543d8c2e39b9680af03eeea0c7248dfb8dc83 (patch)
treecd505461b2dc6a6bd21c7de1c015338ca59ebed7
parent91eb4dc967bcf8affb5c2df70c27d58253e65e93 (diff)
downloadgsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar.gz
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar.bz2
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar.lz
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar.xz
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.tar.zst
gsoc2013-evolution-070543d8c2e39b9680af03eeea0c7248dfb8dc83.zip
(e_signal_connect_full_while_alive): Get to
compile. (e_signal_connect_while_alive): Like. svn path=/trunk/; revision=19201
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-gtk-utils.c6
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 <ettore@ximian.com>
+
+ * e-gtk-utils.c (e_signal_connect_full_while_alive): Get to
+ compile.
+ (e_signal_connect_while_alive): Like.
+
2002-12-19 Ettore Perazzoli <ettore@ximian.com>
* 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);
}