From: John (J5) Palmieri <johnp@redhat.com>
Date: Tue, 4 Mar 2008 15:03:14 +0000 (-0500)
Subject: tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile without X
X-Git-Tag: dbus-1.2.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b48ac65414181b60085534475006de42b018cd;p=thirdparty%2Fdbus.git

tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile without X
---

diff --git a/ChangeLog b/ChangeLog
index 1fcc59573..7d360ebad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  John (J5) Palmieri  <johnp@redhat.com>
+
+	* tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile 
+	  without X
+
 2008-02-28  John (J5) Palmieri  <johnp@redhat.com>
 
 	* dbus/dbus-sysdeps-unix.c: define _AI_ADDRCONFIG as 0 if not
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 5d6e77e81..6a10ffa37 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -966,7 +966,9 @@ main (int argc, char **argv)
       char write_pid_fd_as_string[MAX_FD_LEN];
       char write_address_fd_as_string[MAX_FD_LEN];
 
+#ifdef DBUS_BUILD_X11
       xdisplay = NULL;
+#endif
 
       if (close_stderr)
 	do_close_stderr ();