[maemo-commits] [maemo-commits] r9316 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-01-24 18:20:22 +0200 (Wed, 24 Jan 2007)
New Revision: 9316

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c
Log:
2007-01-24  Michael Natterer  <mitch at imendio.com>

	Merge from upstream trunk:

	* 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.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 15:49:47 UTC (rev 9315)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-24 16:20:22 UTC (rev 9316)
@@ -1,5 +1,14 @@
 2007-01-24  Michael Natterer  <mitch at imendio.com>
 
+	Merge from upstream trunk:
+
+	* 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  Michael Natterer  <mitch at imendio.com>
+
 	* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_allocate):
 	port over "keep focussed child visible when size changes".
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c	2007-01-24 15:49:47 UTC (rev 9315)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkwidget.c	2007-01-24 16:20:22 UTC (rev 9316)
@@ -4727,20 +4727,11 @@
 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