[gnome-terminal/gnome-2-26] Use eggdesktopfile only on x11



commit 129570f981a915ad5acc6ec324d897b5cfd41d05
Author: Christian Persch <chpe gnome org>
Date:   Sun Jun 14 15:42:37 2009 +0200

    Use eggdesktopfile only on x11

 src/Makefile.am |    8 +++++---
 src/terminal.c  |    4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 317bcf7..59d2a67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,8 +75,6 @@ gnome_terminal_LDADD = \
 
 if WITH_SMCLIENT
 gnome_terminal_SOURCES += \
-	eggdesktopfile.c \
-	eggdesktopfile.h \
 	eggsmclient.c \
 	eggsmclient.h \
 	eggsmclient-private.h \
@@ -85,7 +83,11 @@ gnome_terminal_CFLAGS += $(SMCLIENT_CFLAGS)
 gnome_terminal_LDADD += $(SMCLIENT_LIBS)
 
 if WITH_SMCLIENT_XSMP
-gnome_terminal_SOURCES += eggsmclient-xsmp.c
+gnome_terminal_SOURCES += \
+	eggdesktopfile.c \
+	eggdesktopfile.h \
+	eggsmclient-xsmp.c \
+	$(NULL)
 gnome_terminal_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
 endif
 if WITH_SMCLIENT_WIN32
diff --git a/src/terminal.c b/src/terminal.c
index 17de783..49a8651 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -34,8 +34,10 @@
 
 #ifdef WITH_SMCLIENT
 #include "eggsmclient.h"
+#ifdef GDK_WINDOWING_X11
 #include "eggdesktopfile.h"
 #endif
+#endif
 
 #include <dbus/dbus-protocol.h>
 #include <dbus/dbus-glib.h>
@@ -459,7 +461,7 @@ factory_disabled:
   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);
   gtk_about_dialog_set_email_hook (about_email_hook, NULL, NULL);
 
-#ifdef WITH_SMCLIENT
+#if defined(WITH_SMCLIENT) && defined(GDK_WINDOWING_X11)
   {
     char *desktop_file;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]