--- mono/Connection.cs.orig	2006-04-21 00:06:59.000000000 -0400
+++ mono/Connection.cs	2006-04-21 00:24:34.000000000 -0400
@@ -62,6 +62,7 @@
     internal Connection(IntPtr rawConnection)
     {
       RawConnection = rawConnection;
+      ExitOnDisconnect = true;
     }
     
     public Connection(string address)
@@ -77,6 +78,7 @@
       }
 
       SetupWithMain();
+      ExitOnDisconnect = true;
     }
 
     public void Dispose() 
@@ -192,6 +194,14 @@
 	  this.timeout = value;
 	}
     }
+
+    public bool ExitOnDisconnect
+    {
+      set
+    {
+      dbus_connection_set_exit_on_disconnect(RawConnection, value);
+    }
+    }
     
     private int Slot
     {
@@ -350,5 +360,8 @@
     private extern static void dbus_connection_unregister_object_path (IntPtr rawConnection,
 								       string path);
 
+    [DllImport ("dbus-1")]
+    private extern static void dbus_connection_set_exit_on_disconnect (IntPtr rawConnection,
+                          bool exitOnDisconnect);
   }
 }