summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2008-02-21 12:02:58 -0500
committerJohn (J5) Palmieri <johnp@redhat.com>2008-02-21 12:02:58 -0500
commit7d409700c354e7a35989053ba037750d320a308a (patch)
treeedf3fdf220d00c74b7abdae01644570d43cb751e
parentb53e46c2e2dc949e697cc76a076d626a4ffdd0c0 (diff)
fixes dbus-launch so the bus goes away when X does (Red Hat Bug #430412)
* tools/dbus-launch.c (main): set xdisplay = NULL * Patch by Matthias Clasen <mclasen at redhat.com> +
-rw-r--r--ChangeLog7
-rw-r--r--tools/dbus-launch.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d88d5686..ad81838d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-21 John (J5) Palmieri <johnp@redhat.com>
+
+ * fixes dbus-launch so the bus goes away when X does
+ (Red Hat Bug #430412)
+ * tools/dbus-launch.c (main): set xdisplay = NULL
+ * Patch by Matthias Clasen <mclasen at redhat.com>
+
2008-01-17 John (J5) Palmieri <johnp@redhat.com>
* Released 1.1.4
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 894847ea..5d6e77e8 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -966,6 +966,8 @@ main (int argc, char **argv)
char write_pid_fd_as_string[MAX_FD_LEN];
char write_address_fd_as_string[MAX_FD_LEN];
+ xdisplay = NULL;
+
if (close_stderr)
do_close_stderr ();