Change the way tube handler's object-path and bus-name are build.

git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@984 4ee84921-47dd-4033-b63a-18d7a039a3e4

1 files changed, 6 insertions, 19 deletions

diff --git a/src/empathy-tubes-chandler.c b/src/empathy-tubes-chandler.c
index f23281875..ede164c91 100644
--- a/src/empathy-tubes-chandler.c
+++ b/src/empathy-tubes-chandler.c
@@ -27,6 +27,7 @@
 
 #include <extensions/extensions.h>
 
+#include <libempathy/empathy-tube-handler.h>
 #include <libempathy/empathy-chandler.h>
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
@@ -80,26 +81,12 @@ new_tube_cb (TpChannel *channel,
   if (state != TP_TUBE_STATE_LOCAL_PENDING)
       return;
 
-  /* Build the bus-name and object-path of the tube handler */
-  if (type == TP_TUBE_TYPE_DBUS)
-    {
-      thandler_bus_name =
-          g_strdup_printf ("org.gnome.Empathy.DTube.%s", service);
-      thandler_object_path =
-          g_strdup_printf ("/org/gnome/Empathy/DTube/%s", service);
-    }
-  else if (type == TP_TUBE_TYPE_STREAM)
-    {
-      thandler_bus_name =
-          g_strdup_printf ("org.gnome.Empathy.StreamTube.%s", service);
-      thandler_object_path =
-          g_strdup_printf ("/org/gnome/Empathy/StreamTube/%s", service);
-    }
-  else
-      return;
+  thandler_bus_name = empathy_tube_handler_build_bus_name (type, service);
+  thandler_object_path = empathy_tube_handler_build_object_path (type, service);
 
-  empathy_debug (DEBUG_DOMAIN, "Dispatching channel %p id=%d",
-      channel, id);
+  empathy_debug (DEBUG_DOMAIN, "Dispatching channel %p id=%d to tube handler: ",
+      "object_path=%s bus_name=%s", channel, id, thandler_object_path,
+      thandler_bus_name);
 
   /* Create the proxy for the tube handler */
   thandler = g_object_new (TP_TYPE_PROXY,