gimp r25298 - in trunk: . app/gui

[mitch svn gnome org]

Author: mitch
Date: Sat Mar 29 10:50:10 2008
New Revision: 25298
URL: http://svn.gnome.org/viewvc/gimp?rev=25298&view=rev

Log:
2008-03-29  Michael Natterer  <mitch gimp org>

	* app/gui/gui-vtable.c: <gdk/gdkx.h> needs #ifdef GDK_WINDOWING_X11.

	* app/gui/gui.c: remove the include i accidentially added here.



Modified:
   trunk/ChangeLog
   trunk/app/gui/gui-vtable.c
   trunk/app/gui/gui.c

Modified: trunk/app/gui/gui-vtable.c
==============================================================================
--- trunk/app/gui/gui-vtable.c	(original)
+++ trunk/app/gui/gui-vtable.c	Sat Mar 29 10:50:10 2008
@@ -21,7 +21,10 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 
 #include "libgimpwidgets/gimpwidgets.h"
 

Modified: trunk/app/gui/gui.c
==============================================================================
--- trunk/app/gui/gui.c	(original)
+++ trunk/app/gui/gui.c	Sat Mar 29 10:50:10 2008
@@ -22,10 +22,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
 #if HAVE_DBUS_GLIB
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib.h>