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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-01-03 14:39:27 +0200 (Wed, 03 Jan 2007)
New Revision: 8927

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-01-03  Kristian Rietveld  <kris at imendio.com>

	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): allow to disable
	XSHM via GDK_DISABLE_XSHM environment variable.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 11:55:54 UTC (rev 8926)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-01-03 12:39:27 UTC (rev 8927)
@@ -1,3 +1,8 @@
+2007-01-03  Kristian Rietveld  <kris at imendio.com>
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): allow to disable
+	XSHM via GDK_DISABLE_XSHM environment variable.
+
 2006-12-22  Kristian Rietveld  <kris at imendio.com>
 
 	* gtk/gtkwidget.[ch]: Ported over the tap and hold implementation

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-01-03 11:55:54 UTC (rev 8926)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gdk/x11/gdkdisplay-x11.c	2007-01-03 12:39:27 UTC (rev 8927)
@@ -149,7 +149,7 @@
   display = g_object_new (GDK_TYPE_DISPLAY_X11, NULL);
   display_x11 = GDK_DISPLAY_X11 (display);
 
-  display_x11->use_xshm = TRUE;
+  display_x11->use_xshm = g_getenv ("GDK_DISABLE_XSHM") == NULL;
   display_x11->xdisplay = xdisplay;
 
 #ifdef HAVE_X11R6