Commit b96ec2e0 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

rename "signal" arg to "name" to avoid compiler warnings about shadowing

2002-02-04  Havoc Pennington  <hp@pobox.com>

	* gtk/gtksignal.c (gtk_signal_connect_while_alive):
	(gtk_signal_connect_object_while_alive): rename
	"signal" arg to "name" to avoid compiler warnings
	about shadowing signal(). #70453
parent 4eca4af1
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
2002-02-04 Havoc Pennington <hp@pobox.com>
* gtk/gtksignal.c (gtk_signal_connect_while_alive):
(gtk_signal_connect_object_while_alive): rename
"signal" arg to "name" to avoid compiler warnings
about shadowing signal(). #70453
2002-02-03 Anders Carlsson <expander-master@gtk.org>
* gtk/gtkstyle.c (gtk_default_draw_expander): Add
......
......@@ -96,21 +96,21 @@ gtk_signal_emit_stop_by_name (GtkObject *object,
void
gtk_signal_connect_object_while_alive (GtkObject *object,
const gchar *signal,
const gchar *name,
GtkSignalFunc func,
GtkObject *alive_object)
{
g_return_if_fail (GTK_IS_OBJECT (object));
g_signal_connect_closure_by_id (object,
g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
g_cclosure_new_object_swap (func, G_OBJECT (alive_object)),
FALSE);
}
void
gtk_signal_connect_while_alive (GtkObject *object,
const gchar *signal,
const gchar *name,
GtkSignalFunc func,
gpointer func_data,
GtkObject *alive_object)
......@@ -122,7 +122,7 @@ gtk_signal_connect_while_alive (GtkObject *object,
closure = g_cclosure_new (func, func_data, NULL);
g_object_watch_closure (G_OBJECT (alive_object), closure);
g_signal_connect_closure_by_id (object,
g_signal_lookup (signal, G_OBJECT_TYPE (object)), 0,
g_signal_lookup (name, G_OBJECT_TYPE (object)), 0,
closure,
FALSE);
}
......
......@@ -106,11 +106,11 @@ guint gtk_signal_new (const gchar *name,
void gtk_signal_emit_stop_by_name (GtkObject *object,
const gchar *name);
void gtk_signal_connect_object_while_alive (GtkObject *object,
const gchar *signal,
const gchar *name,
GtkSignalFunc func,
GtkObject *alive_object);
void gtk_signal_connect_while_alive (GtkObject *object,
const gchar *signal,
const gchar *name,
GtkSignalFunc func,
gpointer func_data,
GtkObject *alive_object);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment