revert generic disabling of PRELIGHT state for the reasons given in bug

2007-01-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling
	of PRELIGHT state for the reasons given in bug #135666. Widget
	states are sometimes abused or otherwise used wrongly for historic
	reasons, causing this part of the patch to break e.g. menu items.

svn path=/trunk/; revision=17211

diff --git a/ChangeLog b/ChangeLog
index 96fbbc3a284d8120a5654d4f016b9c9f2ec31038..efb0acdc4cee0a5dfff729d6d86222b0f17f97f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling
+       of PRELIGHT state for the reasons given in bug #135666. Widget
+       states are sometimes abused or otherwise used wrongly for historic
+       reasons, causing this part of the patch to break e.g. menu items.
+
 2007-01-24  Roozbeh Pournader  <roozbeh@farsiweb.info>
 
        * README: Remove mention of no-longer-existing PATCH

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 7a727433d87f6e1b1d6bd6539bb3833c2f4d507a..b92c2345734c1ffcd0503e6368d423ba32f80487 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4531,20 +4531,11 @@ void
 gtk_widget_set_state (GtkWidget           *widget,
                      GtkStateType         state)
 {
-  gboolean touchscreen;
-
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   if (state == GTK_WIDGET_STATE (widget))
     return;
 
-  g_object_get (gtk_widget_get_settings (widget),
-                "gtk-touchscreen-mode", &touchscreen,
-                NULL);
-  
-  if (touchscreen && state == GTK_STATE_PRELIGHT)
-    state = GTK_STATE_NORMAL;
-
   if (state == GTK_STATE_INSENSITIVE)
     gtk_widget_set_sensitive (widget, FALSE);
   else