From 5088b4937e77a6aa7b828e6a9ce66e47ef7deceb Mon Sep 17 00:00:00 2001 From: Adam Reichold Date: Sun, 6 Dec 2015 11:30:58 +0100 Subject: [PATCH] Fix method to update menu sensitivity of combo box After removal of the selectable header and separator from the combo box, the method to update the menu sensitivity must be changed as it assumes at least two items within each sub menu and contains special handling for the separator. Removing this fixes bug #759079. --- gtk/gtkcombobox.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 0831ce6965..c6304229d1 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2073,7 +2073,7 @@ update_menu_sensitivity (GtkComboBox *combo_box, { GtkComboBoxPrivate *priv = combo_box->priv; GList *children, *child; - GtkWidget *item, *submenu, *separator; + GtkWidget *item, *submenu; GtkWidget *cell_view; gboolean sensitive; @@ -2099,15 +2099,7 @@ update_menu_sensitivity (GtkComboBox *combo_box, else { sensitive = cell_layout_is_sensitive (GTK_CELL_LAYOUT (cell_view)); - - if (menu != priv->popup_widget && child == children) - { - separator = GTK_WIDGET (child->next->data); - g_object_set (item, "visible", sensitive, NULL); - g_object_set (separator, "visible", sensitive, NULL); - } - else - gtk_widget_set_sensitive (item, sensitive); + gtk_widget_set_sensitive (item, sensitive); } }