Remove check for previous state being ACTIVE. Bug 153876.

Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
	for previous state being ACTIVE. Bug 153876.

diff --git a/ChangeLog b/ChangeLog
index f42f5683b6b6cb3b5564de237e36c1b2a3c9c1cd..6a5a3a0e0daa4a967657da955a8e88a0b338a183 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
+       for previous state being ACTIVE. Bug 153876.
+
 2004-10-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f42f5683b6b6cb3b5564de237e36c1b2a3c9c1cd..6a5a3a0e0daa4a967657da955a8e88a0b338a183 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
+       for previous state being ACTIVE. Bug 153876.
+
 2004-10-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f42f5683b6b6cb3b5564de237e36c1b2a3c9c1cd..6a5a3a0e0daa4a967657da955a8e88a0b338a183 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
+       for previous state being ACTIVE. Bug 153876.
+
 2004-10-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f42f5683b6b6cb3b5564de237e36c1b2a3c9c1cd..6a5a3a0e0daa4a967657da955a8e88a0b338a183 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Oct 23 15:17:55 2004  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenutoolbutton.c (button_state_changed_cb): Remove check
+       for previous state being ACTIVE. Bug 153876.
+
 2004-10-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_drag_data_received) 

diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index fab52ff643dd5d1560bf6449c0ee53bbcd15c57d..678a79dcf99d6d3b6b178ef8202bb562bd1cca0a 100644 (file)
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -258,32 +258,31 @@ button_state_changed_cb (GtkWidget         *widget,
                          GtkMenuToolButton *button)
 {
   GtkMenuToolButtonPrivate *priv;
-  GtkWidget *b;
+  GtkWidget *other;
   GtkStateType state = GTK_WIDGET_STATE (widget);
 
   priv = GTK_MENU_TOOL_BUTTON_GET_PRIVATE (button);
 
-  b = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
+  other = (widget == priv->arrow_button) ? priv->button : priv->arrow_button;
 
-  g_signal_handlers_block_by_func (G_OBJECT (b),
+  g_signal_handlers_block_by_func (G_OBJECT (other),
                                    G_CALLBACK (button_state_changed_cb),
                                    button);
 
-  if (state == GTK_STATE_PRELIGHT &&
-      previous_state != GTK_STATE_ACTIVE)
+  if (state == GTK_STATE_PRELIGHT)
     {
-      gtk_widget_set_state (b, state);
+      gtk_widget_set_state (other, state);
     }
   else if (state == GTK_STATE_NORMAL)
     {
-      gtk_widget_set_state (b, state);
+      gtk_widget_set_state (other, state);
     }
   else if (state == GTK_STATE_ACTIVE)
     {
-      gtk_widget_set_state (b, GTK_STATE_NORMAL);
+      gtk_widget_set_state (other, GTK_STATE_NORMAL);
     }
 
-  g_signal_handlers_unblock_by_func (G_OBJECT (b),
+  g_signal_handlers_unblock_by_func (G_OBJECT (other),
                                      G_CALLBACK (button_state_changed_cb),
                                      button);
 }