--- a/patches/dbus-01-dbus-launch.diff	Fri Nov 24 10:20:54 2006 +0000
+++ b/patches/dbus-01-dbus-launch.diff	Fri Nov 24 12:32:20 2006 +0000
@@ -1,6 +1,6 @@
---- dbus-0.62/tools/dbus-launch.c-orig	2006-08-02 10:56:51.441963000 +0100
-+++ dbus-0.62/tools/dbus-launch.c	2006-08-02 10:54:59.320618000 +0100
-@@ -352,6 +352,9 @@
+--- dbus-1.0.1/tools/dbus-launch.c-orig	2006-08-02 10:56:51.441963000 +0100
++++ dbus-1.0.1/tools/dbus-launch.c	2006-08-02 10:54:59.320618000 +0100
+@@ -392,6 +392,9 @@
    x_fd = -1;
  #endif
  
@@ -10,7 +10,7 @@
    if (isatty (0))
      tty_fd = 0;
    else
-@@ -361,6 +364,7 @@
+@@ -401,6 +404,7 @@
      verbose ("stdin isatty(), monitoring it\n");
    else
      verbose ("stdin was not a TTY, not monitoring it\n");  
@@ -18,10 +18,11 @@
    
    if (tty_fd < 0 && x_fd < 0)
      {
-@@ -414,6 +418,11 @@
-         }
- #endif
- 
+@@ -412,7 +416,11 @@
+     {
+       FD_ZERO (&read_set);
+       FD_ZERO (&err_set);
+-
 +#ifndef __sun
 +/*
 + * read() sometimes returns 0 on Solaris in valid conditions, so this
@@ -29,12 +30,12 @@
 + */
        if (tty_fd >= 0)
          {
-           if (FD_ISSET (tty_fd, &read_set))
-@@ -447,6 +456,7 @@
-               kill_bus_and_exit ();
-             }
+           FD_SET (tty_fd, &read_set);
+@@ -433,6 +441,7 @@
+           verbose ("Got SIGHUP, exiting\n");
+           kill_bus_and_exit (0);
          }
 +#endif
-     }
- }
- 
+       
+ #ifdef DBUS_BUILD_X11
+       /* Dump events on the floor, and let