diff options
| author | Guillaume Desmottes <gdesmott@gnome.org> | 2009-02-17 05:25:25 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-02-17 05:25:25 +0800 |
| commit | 2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7 (patch) | |
| tree | 4f1f7ad9bcc0c74495c2a6dd7b2381e0b14e3f84 /libempathy/empathy-tube-handler.c | |
| parent | 4ea44825231f8ddb45d11cce80393c4cd6b6939f (diff) | |
| download | gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar.gz gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar.bz2 gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar.lz gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar.xz gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.tar.zst gsoc2013-empathy-2d374c38c8d57fb0d2d3a55f2004d6e6d08d12e7.zip | |
use TpTubeType instead of EmpathyTubeType
From: Guillaume Desmottes <gdesmott@gnome.org>
svn path=/trunk/; revision=2490
Diffstat (limited to 'libempathy/empathy-tube-handler.c')
| -rw-r--r-- | libempathy/empathy-tube-handler.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libempathy/empathy-tube-handler.c b/libempathy/empathy-tube-handler.c index 64b96b94d..4fb82177d 100644 --- a/libempathy/empathy-tube-handler.c +++ b/libempathy/empathy-tube-handler.c @@ -144,7 +144,7 @@ empathy_tube_handler_init (EmpathyTubeHandler *thandler) } EmpathyTubeHandler * -empathy_tube_handler_new (EmpathyTubeType type, const gchar *service) +empathy_tube_handler_new (TpTubeType type, const gchar *service) { EmpathyTubeHandler *thandler = NULL; DBusGProxy *proxy; @@ -153,7 +153,7 @@ empathy_tube_handler_new (EmpathyTubeType type, const gchar *service) gchar *object_path; GError *error = NULL; - g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); + g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL); g_return_val_if_fail (service != NULL, NULL); bus_name = empathy_tube_handler_build_bus_name (type, service); @@ -186,18 +186,18 @@ OUT: } gchar * -empathy_tube_handler_build_bus_name (EmpathyTubeType type, +empathy_tube_handler_build_bus_name (TpTubeType type, const gchar *service) { gchar *str = NULL; const gchar *prefix = NULL; - g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); + g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL); g_return_val_if_fail (service != NULL, NULL); - if (type == EMPATHY_TYPE_DBUS_TUBE) + if (type == TP_TUBE_TYPE_DBUS) prefix = "org.gnome.Empathy.DTubeHandler."; - else if (type == EMPATHY_TYPE_STREAM_TUBE) + else if (type == TP_TUBE_TYPE_STREAM) prefix = "org.gnome.Empathy.StreamTubeHandler."; else g_return_val_if_reached (NULL); @@ -208,13 +208,13 @@ empathy_tube_handler_build_bus_name (EmpathyTubeType type, } gchar * -empathy_tube_handler_build_object_path (EmpathyTubeType type, +empathy_tube_handler_build_object_path (TpTubeType type, const gchar *service) { gchar *bus_name; gchar *str; - g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); + g_return_val_if_fail (type < NUM_TP_TUBE_TYPES, NULL); g_return_val_if_fail (service != NULL, NULL); bus_name = empathy_tube_handler_build_bus_name (type, service); |