diff --git a/ChangeLog b/ChangeLog index 16d6d05576..b397d00f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 16d6d05576..b397d00f47 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Thu Mar 8 18:13:20 2001 Tim Janik + + * gtk/testgtk.c: re-enabled event watcher emission hooks. + Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() diff --git a/gtk/testgtk.c b/gtk/testgtk.c index f8fa8ce721..cdfa2e0e81 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -6220,15 +6220,14 @@ static gboolean event_watcher_enter_id = 0; static gboolean event_watcher_leave_id = 0; static gboolean -event_watcher (GtkObject *object, - guint signal_id, - guint n_params, - GtkArg *params, - gpointer data) +event_watcher (GSignalInvocationHint *ihint, + guint n_param_values, + const GValue *param_values, + gpointer data) { g_print ("Watch: \"%s\" emitted for %s\n", - gtk_signal_name (signal_id), - gtk_type_name (GTK_OBJECT_TYPE (object))); + gtk_signal_name (ihint->signal_id), + gtk_type_name (GTK_OBJECT_TYPE (g_value_get_object (param_values + 0)))); return TRUE; } @@ -6241,10 +6240,10 @@ event_watcher_down (void) guint signal_id; signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET); - // gtk_signal_remove_emission_hook (signal_id, event_watcher_enter_id); + g_signal_remove_emission_hook (signal_id, event_watcher_enter_id); event_watcher_enter_id = 0; signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET); - // gtk_signal_remove_emission_hook (signal_id, event_watcher_leave_id); + g_signal_remove_emission_hook (signal_id, event_watcher_leave_id); event_watcher_leave_id = 0; } } @@ -6259,9 +6258,9 @@ event_watcher_toggle (void) guint signal_id; signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET); - // event_watcher_enter_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL); + event_watcher_enter_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL); signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET); - // event_watcher_leave_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL); + event_watcher_leave_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL); } } diff --git a/tests/testgtk.c b/tests/testgtk.c index f8fa8ce721..cdfa2e0e81 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -6220,15 +6220,14 @@ static gboolean event_watcher_enter_id = 0; static gboolean event_watcher_leave_id = 0; static gboolean -event_watcher (GtkObject *object, - guint signal_id, - guint n_params, - GtkArg *params, - gpointer data) +event_watcher (GSignalInvocationHint *ihint, + guint n_param_values, + const GValue *param_values, + gpointer data) { g_print ("Watch: \"%s\" emitted for %s\n", - gtk_signal_name (signal_id), - gtk_type_name (GTK_OBJECT_TYPE (object))); + gtk_signal_name (ihint->signal_id), + gtk_type_name (GTK_OBJECT_TYPE (g_value_get_object (param_values + 0)))); return TRUE; } @@ -6241,10 +6240,10 @@ event_watcher_down (void) guint signal_id; signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET); - // gtk_signal_remove_emission_hook (signal_id, event_watcher_enter_id); + g_signal_remove_emission_hook (signal_id, event_watcher_enter_id); event_watcher_enter_id = 0; signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET); - // gtk_signal_remove_emission_hook (signal_id, event_watcher_leave_id); + g_signal_remove_emission_hook (signal_id, event_watcher_leave_id); event_watcher_leave_id = 0; } } @@ -6259,9 +6258,9 @@ event_watcher_toggle (void) guint signal_id; signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET); - // event_watcher_enter_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL); + event_watcher_enter_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL); signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET); - // event_watcher_leave_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL); + event_watcher_leave_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL); } }