Diff

diff --git a/libempathy/empathy-tube-handler.c b/libempathy/empathy-tube-handler.cindex 740c926..e0a14a8 100644--- a/libempathy/empathy-tube-handler.c+++ b/libempathy/empathy-tube-handler.c@@ -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 <= EMPATHY_TYPE_STREAM_TUBE, NULL);   g_return_val_if_fail (service != NULL, NULL);    bus_name = empathy_tube_handler_build_bus_name (type, service);@@ -191,12 +191,12 @@ empathy_tube_handler_build_bus_name (EmpathyTubeType type,   gchar *str = NULL;   const gchar *prefix = NULL; -  g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL);+  g_return_val_if_fail (type <= EMPATHY_TYPE_STREAM_TUBE, NULL);   g_return_val_if_fail (service != NULL, NULL); -  if (type == TP_TUBE_TYPE_DBUS)+  if (type == EMPATHY_TYPE_DBUS_TUBE)     prefix = "org.gnome.Empathy.DTubeHandler.";-  else if (type == TP_TUBE_TYPE_STREAM)+  else if (type == EMPATHY_TYPE_STREAM_TUBE)     prefix = "org.gnome.Empathy.StreamTubeHandler.";   else     g_return_val_if_reached (NULL);@@ -213,7 +213,7 @@ empathy_tube_handler_build_object_path (EmpathyTubeType type,   gchar *bus_name;   gchar *str; -  g_return_val_if_fail (type <= EMPATHY_TYPE_DBUS_TUBE, NULL);+  g_return_val_if_fail (type <= EMPATHY_TYPE_STREAM_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.hindex 7518a33..5d911f0 100644--- a/libempathy/empathy-tube-handler.h+++ b/libempathy/empathy-tube-handler.h@@ -50,8 +50,8 @@ struct _EmpathyTubeHandlerClass { };  typedef enum {-  EMPATHY_TYPE_STREAM_TUBE = 0,-  EMPATHY_TYPE_DBUS_TUBE+  EMPATHY_TYPE_DBUS_TUBE = 0,+  EMPATHY_TYPE_STREAM_TUBE = 1 } EmpathyTubeType;  GType empathy_tube_handler_get_type (void) G_GNUC_CONST;