diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-01-10 00:16:05 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-10 00:16:05 +0800 |
| commit | 702870d6d81ef54dc33bed04b34c6b5a89c597d9 (patch) | |
| tree | 12bc9d72a181332a1daed1c625c21397b958ed2d | |
| parent | a2c51caa1ffb0bdd4c95d4d45fc442dbf91b27c7 (diff) | |
| download | gsoc2013-empathy-702870d6d81ef54dc33bed04b34c6b5a89c597d9.tar.gz gsoc2013-empathy-702870d6d81ef54dc33bed04b34c6b5a89c597d9.tar.zst gsoc2013-empathy-702870d6d81ef54dc33bed04b34c6b5a89c597d9.zip | |
Don't use the old style TpTubeType
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2200
| -rw-r--r-- | libempathy/empathy-tube-handler.c | 14 | ||||
| -rw-r--r-- | libempathy/empathy-tube-handler.h | 13 |
2 files changed, 16 insertions, 11 deletions
diff --git a/libempathy/empathy-tube-handler.c b/libempathy/empathy-tube-handler.c index cdd868efe..740c926d6 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 (TpTubeType type, const gchar *service) +empathy_tube_handler_new (EmpathyTubeType type, const gchar *service) { EmpathyTubeHandler *thandler = NULL; DBusGProxy *proxy; @@ -153,7 +153,7 @@ empathy_tube_handler_new (TpTubeType type, const gchar *service) gchar *object_path; GError *error = NULL; - g_return_val_if_fail (type <= TP_TUBE_TYPE_STREAM, NULL); + g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); g_return_val_if_fail (service != NULL, NULL); bus_name = empathy_tube_handler_build_bus_name (type, service); @@ -185,12 +185,13 @@ OUT: } gchar * -empathy_tube_handler_build_bus_name (TpTubeType type, const gchar *service) +empathy_tube_handler_build_bus_name (EmpathyTubeType type, + const gchar *service) { gchar *str = NULL; const gchar *prefix = NULL; - g_return_val_if_fail (type <= TP_TUBE_TYPE_STREAM, NULL); + g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); g_return_val_if_fail (service != NULL, NULL); if (type == TP_TUBE_TYPE_DBUS) @@ -206,12 +207,13 @@ empathy_tube_handler_build_bus_name (TpTubeType type, const gchar *service) } gchar * -empathy_tube_handler_build_object_path (TpTubeType type, const gchar *service) +empathy_tube_handler_build_object_path (EmpathyTubeType type, + const gchar *service) { gchar *bus_name; gchar *str; - g_return_val_if_fail (type <= TP_TUBE_TYPE_STREAM, NULL); + g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL); g_return_val_if_fail (service != NULL, NULL); bus_name = empathy_tube_handler_build_bus_name (type, service); diff --git a/libempathy/empathy-tube-handler.h b/libempathy/empathy-tube-handler.h index f20527a68..7518a3303 100644 --- a/libempathy/empathy-tube-handler.h +++ b/libempathy/empathy-tube-handler.h @@ -24,8 +24,6 @@ #include <glib.h> -#include <telepathy-glib/enums.h> - G_BEGIN_DECLS #define EMPATHY_TYPE_TUBE_HANDLER (empathy_tube_handler_get_type ()) @@ -51,12 +49,17 @@ struct _EmpathyTubeHandlerClass { GObjectClass parent_class; }; +typedef enum { + EMPATHY_TYPE_STREAM_TUBE = 0, + EMPATHY_TYPE_DBUS_TUBE +} EmpathyTubeType; + GType empathy_tube_handler_get_type (void) G_GNUC_CONST; -EmpathyTubeHandler *empathy_tube_handler_new (TpTubeType type, +EmpathyTubeHandler *empathy_tube_handler_new (EmpathyTubeType type, const gchar *service); -gchar *empathy_tube_handler_build_bus_name (TpTubeType type, +gchar *empathy_tube_handler_build_bus_name (EmpathyTubeType type, const gchar *service); -gchar *empathy_tube_handler_build_object_path (TpTubeType type, +gchar *empathy_tube_handler_build_object_path (EmpathyTubeType type, const gchar *service); G_END_DECLS |