[maemo-commits] [maemo-commits] r19450 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-10-16 13:26:36 +0300 (Fri, 16 Oct 2009)
New Revision: 19450

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcombobox.c
Log:
2009-10-16  Michael Natterer  <mitch at lanedo.com>

	Fixed: NB#120908 - Combo box is not disabled when there are no
	words stored in the history of Find toolbar

	Apply patch from Kristian Rietveld:

	* gtk/gtkcombobox.c: fix combo box sensitivity by calling
	update_sensitivity() from two places where it was forgotten.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-10-16 06:03:49 UTC (rev 19449)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-10-16 10:26:36 UTC (rev 19450)
@@ -1,3 +1,13 @@
+2009-10-16  Michael Natterer  <mitch at lanedo.com>
+
+	Fixed: NB#120908 - Combo box is not disabled when there are no
+	words stored in the history of Find toolbar
+
+	Apply patch from Kristian Rietveld:
+
+	* gtk/gtkcombobox.c: fix combo box sensitivity by calling
+	update_sensitivity() from two places where it was forgotten.
+
 2009-10-15  Michael Natterer  <mitch at lanedo.com>
 
 	Fixes: NB#137960 - position of CSM is changing while rotating from

Modified: projects/haf/trunk/gtk+/gtk/gtkcombobox.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2009-10-16 06:03:49 UTC (rev 19449)
+++ projects/haf/trunk/gtk+/gtk/gtkcombobox.c	2009-10-16 10:26:36 UTC (rev 19450)
@@ -379,6 +379,8 @@
                                                     gpointer          user_data);
 static void     gtk_combo_box_menu_item_activate   (GtkWidget        *item,
                                                     gpointer          user_data);
+
+static void     gtk_combo_box_update_sensitivity   (GtkComboBox      *combo_box);
 static void     gtk_combo_box_menu_row_inserted    (GtkTreeModel     *model,
                                                     GtkTreePath      *path,
                                                     GtkTreeIter      *iter,
@@ -2983,6 +2985,7 @@
   gtk_combo_box_sync_cells (combo_box, GTK_CELL_LAYOUT (priv->column));
 
   gtk_combo_box_update_title (combo_box);
+  gtk_combo_box_update_sensitivity (combo_box);
 }
 
 static void
@@ -3335,6 +3338,10 @@
     }
 
   gtk_widget_set_sensitive (combo_box->priv->button, sensitive);
+
+  /* In list-mode, we also need to update sensitivity of the event box */
+  if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view))
+    gtk_widget_set_sensitive (combo_box->priv->box, sensitive);
 }
 
 static void
@@ -3894,6 +3901,8 @@
                     combo_box);
 
   gtk_widget_show (priv->tree_view);
+
+  gtk_combo_box_update_sensitivity (combo_box);
 }
 
 static void