empathy r2200 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Jan  9 16:16:05 2009
New Revision: 2200
URL: http://svn.gnome.org/viewvc/empathy?rev=2200&view=rev

Log:
Don't use the old style TpTubeType

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/libempathy/empathy-tube-handler.c
   trunk/libempathy/empathy-tube-handler.h

Modified: trunk/libempathy/empathy-tube-handler.c
==============================================================================
--- trunk/libempathy/empathy-tube-handler.c	(original)
+++ trunk/libempathy/empathy-tube-handler.c	Fri Jan  9 16:16:05 2009
@@ -144,7 +144,7 @@
 }
 
 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 @@
   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 @@
 }
 
 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 @@
 }
 
 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);

Modified: trunk/libempathy/empathy-tube-handler.h
==============================================================================
--- trunk/libempathy/empathy-tube-handler.h	(original)
+++ trunk/libempathy/empathy-tube-handler.h	Fri Jan  9 16:16:05 2009
@@ -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 @@
   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