[maemo-commits] [maemo-commits] r18747 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: kalikiana
Date: 2009-06-17 15:57:47 +0300 (Wed, 17 Jun 2009)
New Revision: 18747

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
Log:
Move back to core events and do not enable the touchscreen
slave device by default.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-06-17 07:36:38 UTC (rev 18746)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-06-17 12:57:47 UTC (rev 18747)
@@ -1,3 +1,10 @@
+2009-06-17  Christian Dywan  <christian at lanedo.com>
+
+	* gdk/x11/gdkinput-x11.c (gdk_input_device_new): Move back to core
+	events and do not enable the touchscreen slave device by default.
+	Patch by Carlos Garnacho.
+	Fixes: NB#122714 Unable to select a particular word or character
+
 2009-06-16  Kristian Rietveld  <kris at lanedo.com>
 
 	Fixes: NB#121544 - Memory leaks found when trying to delete contact(s)

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2009-06-17 07:36:38 UTC (rev 18746)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2009-06-17 12:57:47 UTC (rev 18747)
@@ -114,12 +114,7 @@
       (fixed in 3.2A) */
    gdkdev->info.name = g_strdup ("pointer");
 
-#if defined (MAEMO_CHANGES) && defined (XINPUT_2)
-  if (device->use == IsXPointer)
-    gdkdev->info.mode = GDK_MODE_SCREEN;
-  else
-#endif
-    gdkdev->info.mode = GDK_MODE_DISABLED;
+  gdkdev->info.mode = GDK_MODE_DISABLED;
 
   /* Try to figure out what kind of device this is by its name -
      could invite a very, very, long list... Lowercase name
@@ -255,15 +250,6 @@
   gdkdev->proximityout_type = 0;
   gdkdev->changenotify_type = 0;
 
-#ifdef MAEMO_CHANGES
-  /* always enable extension events to get touchscreen pressure */
-  if (gdkdev->info.source == GDK_SOURCE_PEN)
-    {
-      if (!gdk_device_set_mode (&gdkdev->info, GDK_MODE_SCREEN))
-        g_warning ("Failed to enable pressure on `%s'", gdkdev->info.name);
-    }
-#endif /* MAEMO_CHANGES */
-
   return gdkdev;
 
  error: