turn-by-turn-service: expose the object *before* claiming the bus name

Claiming the well-known bus name should be done at the very least of the
service initialization so it's actually ready to be used when activated.

Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Reviewed-by: Justin Kim <justin.kim@collabora.com>
Differential Revision: https://phabricator.apertis.org/D5361

traprain-guidance/turn-by-turn-service.c

@@ -421,18 +421,9 @@ bus_name_acquired_cb (GDBusConnection *conn,
                       gpointer user_data)
 {
   TrpGuidanceTurnByTurnService *self = user_data;
-  GError *error = NULL;
 
-  if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->service),
-                                         conn, TBT_PATH, &error))
-    {
-      fail_init_tasks (self, error);
-    }
-  else
-    {
-      self->registered = TRUE;
-      complete_init_tasks (self);
-    }
+  self->registered = TRUE;
+  complete_init_tasks (self);
 }
 
 static void
@@ -459,6 +450,7 @@ trp_guidance_turn_by_turn_service_init_async (GAsyncInitable *initable,
   TrpGuidanceTurnByTurnService *self = TRP_GUIDANCE_TURN_BY_TURN_SERVICE (initable);
   g_autoptr (GTask) task = NULL;
   gboolean start_init;
+  GError *error = NULL;
 
   g_return_if_fail (self->conn != NULL);
 
@@ -473,13 +465,22 @@ trp_guidance_turn_by_turn_service_init_async (GAsyncInitable *initable,
   start_init = (self->init_tasks == NULL);
   self->init_tasks = g_list_append (self->init_tasks, g_object_ref (task));
 
-  if (start_init)
-    self->own_name_id = g_bus_own_name_on_connection (self->conn,
-                                                      TBT_BUS_NAME,
-                                                      G_BUS_NAME_OWNER_FLAGS_NONE,
-                                                      bus_name_acquired_cb,
-                                                      bus_name_lost_cb, self,
-                                                      NULL);
+  if (!start_init)
+    return;
+
+  if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (self->service),
+                                         self->conn, TBT_PATH, &error))
+    {
+      fail_init_tasks (self, error);
+      return;
+    }
+
+  self->own_name_id = g_bus_own_name_on_connection (self->conn,
+                                                    TBT_BUS_NAME,
+                                                    G_BUS_NAME_OWNER_FLAGS_NONE,
+                                                    bus_name_acquired_cb,
+                                                    bus_name_lost_cb, self,
+                                                    NULL);
 }
 
 static gboolean