Bug 567413 – GtkComboBoxEntry doesn't emit "changed" signal on entry

2009-01-21  Christian Dywan  <christian@twotoasts.de>

	Bug 567413 – GtkComboBoxEntry doesn't emit "changed" signal
        on entry editing

	* gtk/gtkcombobox.c (gtk_combo_box_set_active): Return only if index
        is set. Patch by Carl-Anton Ingmarsson.

svn path=/trunk/; revision=22152

diff --git a/ChangeLog b/ChangeLog
index acc43aa0b62913722a2cb301de313c7d73e5b78c..96681e5541712d628bbbee88417ab8fd5c6c9833 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-21  Christian Dywan  <christian@twotoasts.de>
+
+       Bug 567413 – GtkComboBoxEntry doesn't emit "changed" signal
+        on entry editing
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_active): Return only if index
+        is set. Patch by Carl-Anton Ingmarsson.
+
 2009-01-20  Torsten Schoenfeld  <kaffeetisch@gmx.de>
 
        * gtk/gtkstyle.c: Add a "Since: 2.16" tag to gtk_style_get.

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index dc3aae1aa78757f945415fca7f18430339446e90..d0d73fcd58ddda5dff6f7462911764f5b04636a0 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4845,7 +4845,8 @@ gtk_combo_box_set_active (GtkComboBox *combo_box,
     {
       /* Save index, in case the model is set after the index */
       combo_box->priv->active = index_;
-      return;
+      if (index_ != -1)
+        return;
     }
 
   if (index_ != -1)