diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-20 05:04:23 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-04-20 05:04:23 +0800 |
| commit | 4c27cbce2a1e6d1b51c3a7f1a983c1278506120e (patch) | |
| tree | 1af396319a7f82ae06a51bd40addd8bc2a583fa2 /src | |
| parent | 14ed90780c03a6d14601cd898d048b70d4a941a9 (diff) | |
| download | gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar.gz gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar.bz2 gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar.lz gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar.xz gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.tar.zst gsoc2013-empathy-4c27cbce2a1e6d1b51c3a7f1a983c1278506120e.zip | |
Change the way tube handler's object-path and bus-name are build.
svn path=/trunk/; revision=984
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-tubes-chandler.c | 25 |
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, |