gtk+ r22500 - in trunk: . gtk

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 10 15:57:16 2009
New Revision: 22500
URL: http://svn.gnome.org/viewvc/gtk+?rev=22500&view=rev

Log:
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.

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcomboboxentry.c

Modified: trunk/gtk/gtkcomboboxentry.c
==============================================================================
--- trunk/gtk/gtkcomboboxentry.c	(original)
+++ trunk/gtk/gtkcomboboxentry.c	Tue Mar 10 15:57:16 2009
@@ -291,13 +291,15 @@
 {
   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 */