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

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2007-03-13 16:06:29 +0200 (Tue, 13 Mar 2007)
New Revision: 10546

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkdisplay-x11.c
Log:
2007-03-13  Michael Natterer  <mitch at imendio.com>

	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): added missing
	#ifdef MAEMO_CHANGES.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 13:39:51 UTC (rev 10545)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 14:06:29 UTC (rev 10546)
@@ -1,5 +1,10 @@
 2007-03-13  Michael Natterer  <mitch at imendio.com>
 
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): added missing
+	#ifdef MAEMO_CHANGES.
+
+2007-03-13  Michael Natterer  <mitch at imendio.com>
+
 	* gdk/gdkwindow.h (enum GdkWindowTypeHint): remove
 	GDK_WINDOW_TYPE_HINT_MESSAGE.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkdisplay-x11.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkdisplay-x11.c	2007-03-13 13:39:51 UTC (rev 10545)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkdisplay-x11.c	2007-03-13 14:06:29 UTC (rev 10546)
@@ -149,7 +149,11 @@
   display = g_object_new (GDK_TYPE_DISPLAY_X11, NULL);
   display_x11 = GDK_DISPLAY_X11 (display);
 
+#ifdef MAEMO_CHANGES
   display_x11->use_xshm = g_getenv ("GDK_DISABLE_XSHM") == NULL;
+#else
+  display_x11->use_xshm = TRUE;
+#endif /* MAEMO_CHANGES */
   display_x11->xdisplay = xdisplay;
 
 #ifdef HAVE_X11R6