]> Pileus Git - ~andy/gtk/commitdiff
combobox: Don't allow an individual cell to cheat
authorBenjamin Otte <otte@redhat.com>
Thu, 22 Dec 2011 14:57:21 +0000 (15:57 +0100)
committerBenjamin Otte <otte@redhat.com>
Thu, 22 Dec 2011 23:15:59 +0000 (00:15 +0100)
Make sure we only set sensitive when the cell is sensitive and visible.
Also avoid invalid memory accesses if no cells existed.

gtk/gtkcombobox.c

index 79d5d27d8d0c924a93e3f0deeb0cc1276941c295..4d7fd8add4f7a6429f3ec47225ae55d57640794b 100644 (file)
@@ -3885,13 +3885,15 @@ gtk_combo_box_list_select_func (GtkTreeSelection *selection,
                         NULL);
 
           if (cell_visible && cell_sensitive)
-            break;
+            {
+              sensitive = TRUE;
+              break;
+            }
 
           cell = cell->next;
         }
-      g_list_free (cells);
 
-      sensitive = cell_sensitive;
+      g_list_free (cells);
     }
 
   g_list_free (columns);