Fixed regression reported in bug #574059. (search button not available in

2009-03-04  Michael Hasselmann <michaelh@openismus.com>

* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_contents_changed):
Fixed regression reported in bug #574059. (search button not available in 
some cases.) The old implementation relied on bug #572478.

svn path=/trunk/; revision=22500
This commit is contained in:
Michael Hasselmann 2009-03-10 15:57:16 +00:00 committed by Murray Cumming
parent 4895771c09
commit 2f915bec20
2 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,9 @@
2009-03-04 Michael Hasselmann <michaelh@openismus.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_contents_changed):
Fixed regression reported in bug #574059. (search button not available in
some cases.) The old implementation relied on bug #572478.
2009-03-10 Alexander Larsson <alexl@redhat.com>
* gtk/gtkmountoperation.c:

View File

@ -291,13 +291,15 @@ gtk_combo_box_entry_contents_changed (GtkEntry *entry,
{
GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
g_signal_handlers_block_by_func (combo_box,
gtk_combo_box_entry_active_changed,
NULL);
gtk_combo_box_set_active (combo_box, -1);
g_signal_handlers_unblock_by_func (combo_box,
gtk_combo_box_entry_active_changed,
NULL);
/*
* Fixes regression reported in bug #574059. The old functionality relied on
* bug #572478. As a bugfix, we now emit the "changed" signal ourselves
* when the selection was already set to -1.
*/
if (gtk_combo_box_get_active(combo_box) == -1)
g_signal_emit_by_name (combo_box, "changed");
else
gtk_combo_box_set_active (combo_box, -1);
}
/* public API */