debug: make add_client() more generic

[empathy.git] / src / empathy-debug-window.c

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 9611da1c3c35c4df146f462aafde7517504cb4c2..f813becc2f9d877e93d4f033f18ff63e60e439d3 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1108,18 +1108,17 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
 }
 
 static void
 }
 
 static void

-add_client (EmpathyDebugWindow *self,
-    const gchar *name)
+add_service (EmpathyDebugWindow *self,
+    const gchar *bus_name,
+    const gchar *display_name,
+    ServiceType type)

 {
 {

-  const gchar *suffix;

   FillServiceChooserData *data;
 
   FillServiceChooserData *data;
 

-  suffix = name + strlen (TP_CLIENT_BUS_NAME_BASE);
-
-  data = fill_service_chooser_data_new (self, suffix, SERVICE_TYPE_CLIENT);
+  data = fill_service_chooser_data_new (self, display_name, type);

 
   tp_cli_dbus_daemon_call_get_name_owner (self->priv->dbus, -1,
 
   tp_cli_dbus_daemon_call_get_name_owner (self->priv->dbus, -1,

-      name, debug_window_get_name_owner_cb, data, NULL, NULL);
+      bus_name, debug_window_get_name_owner_cb, data, NULL, NULL);

 
   self->priv->services_detected ++;
 }
 
   self->priv->services_detected ++;
 }


@@ -1144,7 +1143,8 @@ list_names_cb (TpDBusDaemon *bus_daemon,
     {
       if (g_str_has_prefix (names[i], TP_CLIENT_BUS_NAME_BASE))
         {
     {
       if (g_str_has_prefix (names[i], TP_CLIENT_BUS_NAME_BASE))
         {

-          add_client (self, names[i]);
+          add_service (self, names[i],
+              names[i] + strlen (TP_CLIENT_BUS_NAME_BASE), SERVICE_TYPE_CLIENT);

         }
     }
 }
         }
     }
 }