gnome-terminal r2999 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Sat Aug 23 19:17:32 2008
New Revision: 2999
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2999&view=rev

Log:
Drop X configure checks, and remove unnecessary X header inclusion.

Modified:
   trunk/configure.ac
   trunk/src/terminal-screen.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Aug 23 19:17:32 2008
@@ -34,8 +34,6 @@
 
 AM_GLIB_GNU_GETTEXT
 
-AC_PATH_XTRA
-
 GLIB_REQUIRED=2.16.0
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=2.14.0
@@ -54,9 +52,6 @@
  libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED dnl
  vte >= $VTE_REQUIRED)
 
-TERM_LIBS="$TERM_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-TERM_CFLAGS="$TERM_CFLAGS $X_CFLAGS"
-
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 
 if test x"$GCONFTOOL" = xno; then

Modified: trunk/src/terminal-screen.c
==============================================================================
--- trunk/src/terminal-screen.c	(original)
+++ trunk/src/terminal-screen.c	Sat Aug 23 19:17:32 2008
@@ -25,8 +25,9 @@
 
 #include <gtk/gtk.h>
 
-#include <X11/extensions/Xrender.h>
+#ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
+#endif
 
 #include <gconf/gconf.h>
 #include <libgnome/gnome-util.h> /* gnome_util_user_shell */
@@ -1215,6 +1216,7 @@
   retval[i] = g_strdup ("TERM=xterm"); /* FIXME configurable later? */
   ++i;
 
+#ifdef GDK_WINDOWING_X11
   /* FIXME: moving the tab between windows, or the window between displays will make this invalid... */
   retval[i] = g_strdup_printf ("WINDOWID=%ld",
                                GDK_WINDOW_XWINDOW (term->window));
@@ -1224,6 +1226,7 @@
   retval[i] = g_strdup_printf ("DISPLAY=%s", 
 			       gdk_display_get_name(gtk_widget_get_display(term)));
   ++i;
+#endif
   
   conf = gconf_client_get_default ();