Fix state propagation when making an insensitive combo box sensitive

2004-12-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix
	state propagation when making an insensitive combo box sensitive
	again.  (#162524, Carlos Garnacho Parro)

diff --git a/ChangeLog b/ChangeLog
index 65468608d6954cf4e10638426c2492b6ee232e1c..39f7906561d20a8d17e72fcb8e0c322de60d38f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix
+       state propagation when making an insensitive combo box sensitive
+       again.  (#162524, Carlos Garnacho Parro)
+
        * gtk/gtkfilechooserdefault.c: Use secondary text for error 
        dialogs.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 65468608d6954cf4e10638426c2492b6ee232e1c..39f7906561d20a8d17e72fcb8e0c322de60d38f4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-12-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix
+       state propagation when making an insensitive combo box sensitive
+       again.  (#162524, Carlos Garnacho Parro)
+
        * gtk/gtkfilechooserdefault.c: Use secondary text for error 
        dialogs.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 65468608d6954cf4e10638426c2492b6ee232e1c..39f7906561d20a8d17e72fcb8e0c322de60d38f4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-12-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix
+       state propagation when making an insensitive combo box sensitive
+       again.  (#162524, Carlos Garnacho Parro)
+
        * gtk/gtkfilechooserdefault.c: Use secondary text for error 
        dialogs.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 65468608d6954cf4e10638426c2492b6ee232e1c..39f7906561d20a8d17e72fcb8e0c322de60d38f4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-12-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_button_state_changed): Fix
+       state propagation when making an insensitive combo box sensitive
+       again.  (#162524, Carlos Garnacho Parro)
+
        * gtk/gtkfilechooserdefault.c: Use secondary text for error 
        dialogs.
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index eb567fb5f2e2cdc98ce0c47a6f7c7c43a9d2522f..8898c766d94cfbd31838d237e412b3d660180e04 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -854,8 +854,15 @@ gtk_combo_box_button_state_changed (GtkWidget    *widget,
   if (GTK_WIDGET_REALIZED (widget))
     {
       if (!combo_box->priv->tree_view && combo_box->priv->cell_view)
-       gtk_widget_set_state (combo_box->priv->cell_view, 
-                             GTK_WIDGET_STATE (widget));
+       {
+         if ((GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) !=
+             (GTK_WIDGET_STATE (combo_box->priv->cell_view) == GTK_STATE_INSENSITIVE))
+           gtk_widget_set_sensitive (combo_box->priv->cell_view, GTK_WIDGET_SENSITIVE (widget));
+         
+         gtk_widget_set_state (combo_box->priv->cell_view, 
+                               GTK_WIDGET_STATE (widget));
+         
+       }
     }
 
   gtk_widget_queue_draw (widget);