Don't use the old style TpTubeType

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2200

diff --git a/libempathy/empathy-tube-handler.c b/libempathy/empathy-tube-handler.c
index cdd868efef3497f1e28cdfc3764bd053ba44852f..740c926d643854d580fcd2f19e2913b5653d1ce6 100644 (file)
--- 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 f20527a68fc8bd741453ccdb502287a040e87780..7518a33032602f239d40ba048b8ad27dfc2240d7 100644 (file)
--- 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