diff options
| -rw-r--r-- | libempathy/empathy-tube-handler.c | 16 | ||||
| -rw-r--r-- | libempathy/empathy-tube-handler.h | 13 | ||||
| -rw-r--r-- | src/empathy-tube-dispatch.c | 6 |
3 files changed, 16 insertions, 19 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); diff --git a/libempathy/empathy-tube-handler.h b/libempathy/empathy-tube-handler.h index 7518a3303..f20527a68 100644 --- a/libempathy/empathy-tube-handler.h +++ b/libempathy/empathy-tube-handler.h @@ -24,6 +24,8 @@ #include <glib.h> +#include <telepathy-glib/enums.h> + G_BEGIN_DECLS #define EMPATHY_TYPE_TUBE_HANDLER (empathy_tube_handler_get_type ()) @@ -49,17 +51,12 @@ 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 (EmpathyTubeType type, +EmpathyTubeHandler *empathy_tube_handler_new (TpTubeType type, const gchar *service); -gchar *empathy_tube_handler_build_bus_name (EmpathyTubeType type, +gchar *empathy_tube_handler_build_bus_name (TpTubeType type, const gchar *service); -gchar *empathy_tube_handler_build_object_path (EmpathyTubeType type, +gchar *empathy_tube_handler_build_object_path (TpTubeType type, const gchar *service); G_END_DECLS diff --git a/src/empathy-tube-dispatch.c b/src/empathy-tube-dispatch.c index c051dec2f..b1e7bce6d 100644 --- a/src/empathy-tube-dispatch.c +++ b/src/empathy-tube-dispatch.c @@ -147,7 +147,7 @@ empathy_tube_dispatch_constructed (GObject *object) GHashTable *properties; const gchar *service; const gchar *channel_type; - EmpathyTubeType type; + TpTubeType type; priv->dbus = tp_dbus_daemon_new (tp_get_bus()); @@ -161,13 +161,13 @@ empathy_tube_dispatch_constructed (GObject *object) if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) { - type = EMPATHY_TYPE_STREAM_TUBE; + type = TP_TUBE_TYPE_STREAM; service = tp_asv_get_string (properties, EMP_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"); } else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE)) { - type = EMPATHY_TYPE_DBUS_TUBE; + type = TP_TUBE_TYPE_DBUS; service = tp_asv_get_string (properties, EMP_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName"); } |