diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2008-04-03 11:11:19 -0400 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2008-04-03 11:11:19 -0400 |
commit | 960fef844bdb0054c082a31e43f9631b1d5eb69b (patch) | |
tree | e39cc0f5db0dce6149711c9088d2965130ade8e0 /dbus | |
parent | a37404111be4912cd8b51080bcbe219edded35f5 (diff) | |
parent | 68f69d38182ed5974984b0434086e6a288b477cb (diff) |
Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus
Conflicts:
ChangeLog
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-bus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index c7f43e8c..e159dae7 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -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 |