diff --git a/ChangeLog b/ChangeLog index 9fd880ee597c6cd9d57c0310ab23d90b0ac363f4..5c48f1762a731bab3edf03433286eae6bf2d2f49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-11-21 Matthias Clasen + + Fix for bug #321542, Benedikt Meurer: + + * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): + Emit notify::active. + + (gtk_combo_box_child_show, gtk_combo_box_child_hide): Use + g_signal_emit, not g_signal_emit_by_name. + 2005-11-18 Matthias Clasen Fix crashes in connection with pathbar scrolling (#321560, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9fd880ee597c6cd9d57c0310ab23d90b0ac363f4..5c48f1762a731bab3edf03433286eae6bf2d2f49 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2005-11-21 Matthias Clasen + + Fix for bug #321542, Benedikt Meurer: + + * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): + Emit notify::active. + + (gtk_combo_box_child_show, gtk_combo_box_child_hide): Use + g_signal_emit, not g_signal_emit_by_name. + 2005-11-18 Matthias Clasen Fix crashes in connection with pathbar scrolling (#321560, diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 4be906aadba36cda4c7df3c315c1c6f4fac906ad..1a2aa834fbd11bcb10611e271f4203016ad3ddfd 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2127,8 +2127,7 @@ gtk_combo_box_child_show (GtkWidget *widget, gpointer user_data) { GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - g_signal_emit_by_name (combo_box, "popup-show", NULL, NULL); + g_signal_emit (combo_box, combo_box_signals[POPUP_SHOW], 0); } static void @@ -2136,8 +2135,7 @@ gtk_combo_box_child_hide (GtkWidget *widget, gpointer user_data) { GtkComboBox *combo_box = GTK_COMBO_BOX (user_data); - - g_signal_emit_by_name (combo_box, "popup-hide", NULL, NULL); + g_signal_emit (combo_box, combo_box_signals[POPUP_HIDE], 0); } static gboolean @@ -4526,7 +4524,8 @@ gtk_combo_box_set_active_internal (GtkComboBox *combo_box, path); } - g_signal_emit_by_name (combo_box, "changed", NULL, NULL); + g_signal_emit (combo_box, combo_box_signals[CHANGED], 0); + g_object_notify (G_OBJECT (combo_box), "active"); }