fd.o #10613: tp_base_connection_unregister: release object path before bus name

We're effectively using the bus name as a mutex to protect the object
path, because dbus-glib doesn't have failable object path acquisition.

Now that we (can) explicitly remove the object from the bus, we can do
that properly, fixing a longstanding bug.

1 files changed, 5 insertions, 5 deletions

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 4ce1b585b..39c042595 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -551,11 +551,16 @@ tp_base_connection_unregister (TpBaseConnection *self)
       GHashTableIter iter;
       gpointer k;
 
+      if (priv->been_registered)
+        tp_dbus_daemon_unregister_object (priv->bus_proxy, self);
+
       if (self->bus_name != NULL)
         {
           tp_dbus_daemon_release_name (priv->bus_proxy, self->bus_name, NULL);
         }
 
+      priv->been_registered = FALSE;
+
       g_hash_table_iter_init (&iter, self->priv->interested_clients);
 
       while (g_hash_table_iter_next (&iter, &k, NULL))
@@ -564,11 +569,6 @@ tp_base_connection_unregister (TpBaseConnection *self)
               tp_base_connection_interested_name_owner_changed_cb, self);
           g_hash_table_iter_remove (&iter);
         }
-
-      if (priv->been_registered)
-        tp_dbus_daemon_unregister_object (priv->bus_proxy, self);
-
-      priv->been_registered = FALSE;
     }
 }