[Telepathy-commits] [telepathy-gabble/master] Give TubeDBus' state the type GabbleTubeChannelState

[Will Thompson]

---
 src/tube-dbus.c  |   10 +++++-----
 src/tube-iface.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index ce6cafb..b2c5024 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -433,7 +433,7 @@ unref_handle_foreach (gpointer key,
   tp_handle_unref (contact_repo, handle);
 }
 
-static TpTubeState
+static GabbleTubeChannelState
 get_tube_state (GabbleTubeDBus *self)
 {
   GabbleTubeDBusPrivate *priv = GABBLE_TUBE_DBUS_GET_PRIVATE (self);
@@ -441,21 +441,21 @@ get_tube_state (GabbleTubeDBus *self)
 
   if (priv->bytestream == NULL)
     /* bytestream not yet created as we're waiting for the SI reply */
-    return TP_TUBE_STATE_REMOTE_PENDING;
+    return GABBLE_TUBE_CHANNEL_STATE_REMOTE_PENDING;
 
   g_object_get (priv->bytestream, "state", &bytestream_state, NULL);
 
   switch (bytestream_state)
     {
       case GABBLE_BYTESTREAM_STATE_OPEN:
-        return TP_TUBE_STATE_OPEN;
+        return GABBLE_TUBE_CHANNEL_STATE_OPEN;
         break;
       case GABBLE_BYTESTREAM_STATE_LOCAL_PENDING:
       case GABBLE_BYTESTREAM_STATE_ACCEPTED:
-        return TP_TUBE_STATE_LOCAL_PENDING;
+        return GABBLE_TUBE_CHANNEL_STATE_LOCAL_PENDING;
         break;
       case GABBLE_BYTESTREAM_STATE_INITIATING:
-        return TP_TUBE_STATE_REMOTE_PENDING;
+        return GABBLE_TUBE_CHANNEL_STATE_REMOTE_PENDING;
         break;
       default:
         g_return_val_if_reached (0);
diff --git a/src/tube-iface.c b/src/tube-iface.c
index 0a819d0..bdc3361 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -133,7 +133,7 @@ gabble_tube_iface_base_init (gpointer klass)
       param_spec = g_param_spec_uint (
           "state",
           "Tube state",
-          "The GabbleTubeState of this tube object",
+          "The GabbleTubeChannelState of this tube object",
           0, G_MAXUINT32, TP_TUBE_STATE_REMOTE_PENDING,
           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
       g_object_interface_install_property (klass, param_spec);
-- 
1.5.6.5