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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-06-25 12:04:47 +0300 (Mon, 25 Jun 2007)
New Revision: 12442

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
Log:
2007-06-25  Xan Lopez  <xan.lopez at nokia.com>

	* gdk/x11/gdkinput-x11.c (gdk_input_translate_coordinates): protect maemo changes with
	MAEMO_CHANGES.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-06-25 08:54:20 UTC (rev 12441)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-06-25 09:04:47 UTC (rev 12442)
@@ -1,3 +1,8 @@
+2007-06-25  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gdk/x11/gdkinput-x11.c (gdk_input_translate_coordinates): protect maemo changes with
+	MAEMO_CHANGES.
+
 2007-06-19  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gdk/x11/gdkwindow-x11.c (show_window_internal): drop MAEMO_CHANGES code

Modified: projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2007-06-25 08:54:20 UTC (rev 12441)
+++ projects/haf/trunk/gtk+/gdk/x11/gdkinput-x11.c	2007-06-25 09:04:47 UTC (rev 12442)
@@ -457,6 +457,7 @@
 	}
     }
 
+#ifdef MAEMO_CHANGES
   /* Xi spec allows max_value be unset (0 or -1 usually) meaning
    * bounded to screen size
    */
@@ -471,6 +472,7 @@
   else
     device_height = (gdkdev->axes[y_axis].max_value -
                      gdkdev->axes[y_axis].min_value);
+#endif /* MAEMO_CHANGES */
 
   if (gdkdev->info.mode == GDK_MODE_SCREEN) 
     {