Commit 52ea0f2c authored by Colin Walters's avatar Colin Walters

Set default exit_on_disconnect after registration

2008-03-26  Colin Walters  <walters@verbum.org>
	Patch from Scott James Remnant <scott@netsplit.com>

	* dbus/dbus-bus.c: Set default exit_on_disconnect after registration with
	the bus, not before.  This ensures that programs which wish to set
	exit_on_disconnect to FALSE will not be terminated if the bus exits
	during registration.  (FDO Bug #15112)
parent d2515148
2008-03-26 Colin Walters <walters@verbum.org>
Patch from Scott James Remnant <scott@netsplit.com>
* dbus/dbus-bus.c: Set default exit_on_disconnect after registration with
the bus, not before. This ensures that programs which wish to set
exit_on_disconnect to FALSE will not be terminated if the bus exits
during registration. (FDO Bug #15112)
2008-03-04 John (J5) Palmieri <johnp@redhat.com>
* fix broken poll on Mac OSX - build patch by Benjamin Reed
......
......@@ -436,12 +436,6 @@ internal_bus_get (DBusBusType type,
return NULL;
}
/* By default we're bound to the lifecycle of
* the message bus.
*/
dbus_connection_set_exit_on_disconnect (connection,
TRUE);
if (!dbus_bus_register (connection, error))
{
_DBUS_ASSERT_ERROR_IS_SET (error);
......@@ -461,6 +455,12 @@ internal_bus_get (DBusBusType type,
bus_connections[type] = connection;
}
/* By default we're bound to the lifecycle of
* the message bus.
*/
dbus_connection_set_exit_on_disconnect (connection,
TRUE);
_DBUS_LOCK (bus_datas);
bd = ensure_bus_data (connection);
_dbus_assert (bd != NULL); /* it should have been created on
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment