[Telepathy-commits] [telepathy-glib/master] fd.o#20165: tp_base_connection_manager_register: don't use a TpDBusDaemon that we just unreffed

[Simon McVittie]

This wouldn't be a problem in a connection manager that uses
tp_run_connection_manager() (because in practice a single
TpDBusDaemon is used for the whole run, and it still has one ref
even after we unref it), but it causes failures in one of the
telepathy-qt4 regression tests (which instantiates its own
TpBaseConnectionManager subclass).

Reviewed-by: Will Thompson <will.thompson at collabora.co.uk>
---
 telepathy-glib/base-connection-manager.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index bd5afff..a6dfc93 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -893,13 +893,12 @@ tp_base_connection_manager_register (TpBaseConnectionManager *self)
       return FALSE;
     }
 
-  g_object_unref (bus_proxy);
-
   g_string_assign (string, TP_CM_OBJECT_PATH_BASE);
   g_string_append (string, cls->cm_dbus_name);
   dbus_g_connection_register_g_object (
       tp_proxy_get_dbus_connection (bus_proxy), string->str, G_OBJECT (self));
 
+  g_object_unref (bus_proxy);
   g_string_free (string, TRUE);
 
   return TRUE;
-- 
1.5.6.5