From e99e12428d46db3be2878f6c2ca63bd7510149f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 May 2008 17:27:48 +0000 Subject: ** Fixes bug #534360 2008-05-22 Matthew Barnes ** Fixes bug #534360 Migrate from deprecated GtkObject symbols to GObject equivalents. Touches over 150 files in all components; too many to list. svn path=/trunk/; revision=35526 --- widgets/misc/e-combo-button.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'widgets/misc/e-combo-button.c') diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index 5b732e1299..541d476d2e 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -391,7 +391,7 @@ impl_released (GtkButton *button) gtk_button_clicked (button); if (! priv->menu_popped_up) - gtk_signal_emit (GTK_OBJECT (button), signals[ACTIVATE_DEFAULT]); + g_signal_emit (button, signals[ACTIVATE_DEFAULT], 0); } new_state = (button->in_button ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); @@ -429,12 +429,13 @@ e_combo_button_class_init (EComboButtonClass *combo_button_class) button_class = GTK_BUTTON_CLASS (object_class); button_class->released = impl_released; - signals[ACTIVATE_DEFAULT] = gtk_signal_new ("activate_default", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - G_STRUCT_OFFSET (EComboButtonClass, activate_default), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + signals[ACTIVATE_DEFAULT] = g_signal_new ("activate_default", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (EComboButtonClass, activate_default), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); e_combo_button_a11y_init (); } -- cgit v1.2.3