summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2008-03-04 10:03:14 -0500
committerJohn (J5) Palmieri <johnp@redhat.com>2008-03-04 10:03:14 -0500
commit46b48ac65414181b60085534475006de42b018cd (patch)
tree48d80c5c27c2cb8c96294d76c7d9d8403a7db5af
parentf269ceaa63a01ddfc3789371e170b464f55f208d (diff)
tools/dbus-launch.c: wrap X'ism in #ifdef so we can compile without X
-rw-r--r--ChangeLog5
-rw-r--r--tools/dbus-launch.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fcc5957..7d360eba 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 5d6e77e8..6a10ffa3 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 ();