Replace TpExportableChannel with TpBaseChannel

7 files changed, 57 insertions, 49 deletions

diff --git a/src/ft-manager.c b/src/ft-manager.c
index f23bcb2f..f83f127f 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -197,7 +197,7 @@ salut_ft_manager_finalize (GObject *object)
 /* Channel Manager interface */
 
 struct foreach_data {
-  TpExportableChannelFunc func;
+  TpBaseChannelFunc func;
   gpointer data;
 };
 
@@ -205,20 +205,20 @@ static void
 salut_ft_manager_iface_foreach_one (gpointer value,
                                     gpointer data)
 {
-  TpExportableChannel *chan;
+  TpBaseChannel *chan;
   struct foreach_data *f = (struct foreach_data *) data;
 
   if (!value)
     return;
 
-  chan = TP_EXPORTABLE_CHANNEL (value);
+  chan = TP_BASE_CHANNEL (value);
 
   f->func (chan, f->data);
 }
 
 static void
 salut_ft_manager_foreach_channel (TpChannelManager *iface,
-                                  TpExportableChannelFunc func,
+                                  TpBaseChannelFunc func,
                                   gpointer data)
 {
   SalutFtManager *mgr = SALUT_FT_MANAGER (iface);
@@ -262,8 +262,9 @@ salut_ft_manager_channel_created (SalutFtManager *self,
 {
   SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
   GSList *requests = NULL;
+  TpBaseChannel *base = TP_BASE_CHANNEL (chan);
 
-  tp_base_channel_register (TP_BASE_CHANNEL (chan));
+  tp_base_channel_register (base);
 
   g_signal_connect (chan, "closed", G_CALLBACK (file_channel_closed_cb), self);
 
@@ -273,7 +274,7 @@ salut_ft_manager_channel_created (SalutFtManager *self,
     requests = g_slist_prepend (requests, request_token);
 
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (chan), requests);
+      base, requests);
 
   g_slist_free (requests);
 }
diff --git a/src/im-manager.c b/src/im-manager.c
index bea3a119..aab0cd50 100644
--- a/src/im-manager.c
+++ b/src/im-manager.c
@@ -305,7 +305,7 @@ salut_im_manager_finalize (GObject *object)
 
 struct foreach_data
 {
-  TpExportableChannelFunc func;
+  TpBaseChannelFunc func;
   gpointer data;
 };
 
@@ -314,7 +314,7 @@ salut_im_manager_iface_foreach_one (gpointer key,
                                     gpointer value,
                                     gpointer data)
 {
-  TpExportableChannel *chan = TP_EXPORTABLE_CHANNEL (value);
+  TpBaseChannel *chan = TP_BASE_CHANNEL (value);
   struct foreach_data *f = (struct foreach_data *) data;
 
   f->func (chan, f->data);
@@ -322,7 +322,7 @@ salut_im_manager_iface_foreach_one (gpointer key,
 
 static void
 salut_im_manager_foreach_channel (TpChannelManager *iface,
-                                  TpExportableChannelFunc func,
+                                  TpBaseChannelFunc func,
                                   gpointer user_data)
 {
   SalutImManager *mgr = SALUT_IM_MANAGER (iface);
@@ -386,7 +386,7 @@ salut_im_manager_requestotron (SalutImManager *self,
       base_conn, TP_ENTITY_TYPE_CONTACT);
   TpHandle handle;
   GError *error = NULL;
-  TpExportableChannel *channel;
+  TpBaseChannel *channel;
 
   if (tp_strdiff (tp_asv_get_string (request_properties,
           TP_IFACE_CHANNEL ".ChannelType"), TP_IFACE_CHANNEL_TYPE_TEXT))
@@ -494,7 +494,7 @@ im_channel_closed_cb (SalutImChannel *chan,
   TpHandle handle;
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-    TP_EXPORTABLE_CHANNEL (chan));
+    TP_BASE_CHANNEL (chan));
 
   if (priv->channels)
     {
@@ -515,6 +515,7 @@ salut_im_manager_new_channel (SalutImManager *mgr,
   TpHandleRepoIface *handle_repo =
       tp_base_connection_get_handles (base_connection, TP_ENTITY_TYPE_CONTACT);
   SalutImChannel *chan;
+  TpBaseChannel *base;
   SalutContact *contact;
   const gchar *name;
   GSList *requests = NULL;
@@ -542,7 +543,8 @@ salut_im_manager_new_channel (SalutImManager *mgr,
       "initiator-handle", initiator,
       "requested", (handle != initiator),
       NULL);
-  tp_base_channel_register ((TpBaseChannel *) chan);
+  base = TP_BASE_CHANNEL (chan);
+  tp_base_channel_register (base);
   g_object_unref (contact);
   g_hash_table_insert (priv->channels, GUINT_TO_POINTER (handle), chan);
 
@@ -550,7 +552,7 @@ salut_im_manager_new_channel (SalutImManager *mgr,
     requests = g_slist_prepend (requests, request);
 
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-      TP_EXPORTABLE_CHANNEL (chan), requests);
+      base, requests);
 
   g_slist_free (requests);
 
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 1433d971..dd018d3f 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1778,7 +1778,7 @@ salut_muc_channel_tube_request (SalutMucChannel *self,
 
 void
 salut_muc_channel_foreach (SalutMucChannel *self,
-    TpExportableChannelFunc func,
+    TpBaseChannelFunc func,
     gpointer user_data)
 {
   SalutMucChannelPrivate *priv = self->priv;
@@ -1788,7 +1788,7 @@ salut_muc_channel_foreach (SalutMucChannel *self,
   g_hash_table_iter_init (&iter, priv->tubes);
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      func (TP_EXPORTABLE_CHANNEL (value), user_data);
+      func (TP_BASE_CHANNEL (value), user_data);
     }
 }
 
diff --git a/src/muc-channel.h b/src/muc-channel.h
index 96259f03..bbd5c926 100644
--- a/src/muc-channel.h
+++ b/src/muc-channel.h
@@ -91,7 +91,7 @@ SalutTubeIface * salut_muc_channel_tube_request (SalutMucChannel *self,
     GHashTable *request_properties);
 
 void salut_muc_channel_foreach (SalutMucChannel *self,
-    TpExportableChannelFunc func, gpointer user_data);
+    TpBaseChannelFunc func, gpointer user_data);
 
 void salut_muc_channel_bytestream_offered (SalutMucChannel *self,
     GibberBytestreamIface *bytestream,
diff --git a/src/muc-manager.c b/src/muc-manager.c
index f9d5846b..bedf9a60 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -85,7 +85,7 @@ struct _SalutMucManagerPrivate
   /* tube ID => owned SalutTubeIface */
   GHashTable *tubes;
 
-  /* borrowed TpExportableChannel => owned GSList of gpointer  */
+  /* borrowed TpBaseChannel => owned GSList of gpointer  */
   GHashTable *queued_requests;
 
   /* borrowed SalutMucChannel => owned GSList of borrowed SalutTubeIface */
@@ -304,7 +304,7 @@ salut_muc_manager_dispose (GObject *object)
 
 static void
 salut_muc_manager_foreach_channel (TpChannelManager *iface,
-                                   TpExportableChannelFunc foreach,
+                                   TpBaseChannelFunc foreach,
                                    gpointer user_data)
 {
   SalutMucManager *fac = SALUT_MUC_MANAGER (iface);
@@ -315,7 +315,7 @@ salut_muc_manager_foreach_channel (TpChannelManager *iface,
   g_hash_table_iter_init (&iter, priv->text_channels);
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      TpExportableChannel *chan = TP_EXPORTABLE_CHANNEL (value);
+      TpBaseChannel *chan = TP_BASE_CHANNEL (value);
 
       /* do the text channel */
       foreach (chan, user_data);
@@ -420,14 +420,14 @@ muc_channel_closed_cb (SalutMucChannel *chan,
   if (tp_base_channel_is_respawning (base))
     {
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-          TP_EXPORTABLE_CHANNEL (chan), NULL);
+          base, NULL);
       return;
     }
 
   if (tp_base_channel_is_registered (base))
     {
       tp_channel_manager_emit_channel_closed_for_object (
-          TP_CHANNEL_MANAGER (self), TP_EXPORTABLE_CHANNEL (chan));
+          TP_CHANNEL_MANAGER (self), base);
     }
 
   if (tp_base_channel_is_destroyed (base)
@@ -447,7 +447,7 @@ muc_channel_tube_closed_cb (SalutTubeIface *tube,
   SalutMucChannel *channel;
 
   tp_channel_manager_emit_channel_closed_for_object (
-      TP_CHANNEL_MANAGER (mgr), TP_EXPORTABLE_CHANNEL (tube));
+      TP_CHANNEL_MANAGER (mgr), TP_BASE_CHANNEL (tube));
 
   channel = g_object_get_qdata (G_OBJECT (tube), TUBE_TEXT_QUARK);
   g_assert (channel != NULL);
@@ -464,8 +464,10 @@ muc_channel_new_tube_cb (SalutMucChannel *channel,
     SalutTubeIface *tube,
     SalutMucManager *mgr)
 {
+  TpBaseChannel *base = TP_BASE_CHANNEL (tube);
+
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-      TP_EXPORTABLE_CHANNEL (tube), NULL);
+      base, NULL);
 
   g_signal_connect (tube, "closed",
       G_CALLBACK (muc_channel_tube_closed_cb), mgr);
@@ -493,14 +495,15 @@ muc_channel_ready_cb (SalutMucChannel *chan,
   SalutMucManagerPrivate *priv = SALUT_MUC_MANAGER_GET_PRIVATE (mgr);
   GSList *tube_channels;
   GSList *l;
+  TpBaseChannel *base = TP_BASE_CHANNEL (chan);
 
   /* announce the text channel finally, but only if it is on the bus */
-  if (tp_base_channel_is_registered (TP_BASE_CHANNEL (chan)))
+  if (tp_base_channel_is_registered (base))
     {
       GSList *satisfied = g_hash_table_lookup (priv->queued_requests, chan);
 
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-          TP_EXPORTABLE_CHANNEL (chan), satisfied);
+          base, satisfied);
     }
   g_hash_table_remove (priv->queued_requests, chan);
 
@@ -515,7 +518,7 @@ muc_channel_ready_cb (SalutMucChannel *chan,
       requests_satisfied = g_hash_table_lookup (priv->queued_requests, tube);
 
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-          TP_EXPORTABLE_CHANNEL (tube), requests_satisfied);
+          TP_BASE_CHANNEL (tube), requests_satisfied);
 
       g_hash_table_remove (priv->queued_requests, tube);
     }
@@ -553,7 +556,7 @@ muc_channel_join_error_cb (SalutMucChannel *chan,
 
   for (l = tube_channels; l != NULL; l = l->next)
     {
-      TpExportableChannel *tube = TP_EXPORTABLE_CHANNEL (l->data);
+      TpBaseChannel *tube = TP_BASE_CHANNEL (l->data);
 
       requests_satisfied = g_hash_table_lookup (priv->queued_requests, tube);
       FAIL_REQUESTS (requests_satisfied);
@@ -712,7 +715,7 @@ salut_muc_manager_request_new_muc_channel (SalutMucManager *mgr,
             tokens = g_slist_prepend (tokens, request_token);
 
           tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-              TP_EXPORTABLE_CHANNEL (text_chan), tokens);
+              TP_BASE_CHANNEL (text_chan), tokens);
         }
       else
         {
@@ -766,7 +769,7 @@ handle_tube_channel_request (SalutMucManager *self,
       GSList *request_tokens = g_slist_append (NULL, request_token);
 
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-          TP_EXPORTABLE_CHANNEL (new_channel), request_tokens);
+          TP_BASE_CHANNEL (new_channel), request_tokens);
 
       g_slist_free (request_tokens);
     }
@@ -857,6 +860,7 @@ salut_muc_manager_request (SalutMucManager *self,
   TpHandle handle;
   const gchar *channel_type;
   SalutMucChannel *text_chan;
+  TpBaseChannel *base;
 
   if (tp_asv_get_uint32 (request_properties,
       TP_IFACE_CHANNEL ".TargetEntityType", NULL) != TP_ENTITY_TYPE_ROOM)
@@ -887,8 +891,10 @@ salut_muc_manager_request (SalutMucManager *self,
 
       if (text_chan != NULL)
         {
+          base = TP_BASE_CHANNEL (text_chan);
+
           if (require_new
-              && tp_base_channel_is_registered (TP_BASE_CHANNEL (text_chan)))
+              && tp_base_channel_is_registered (base))
             {
               g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
                   "That channel has already been created (or requested)");
@@ -896,22 +902,21 @@ salut_muc_manager_request (SalutMucManager *self,
             }
           else
             {
-              if (tp_base_channel_is_registered (TP_BASE_CHANNEL (text_chan)))
+              if (tp_base_channel_is_registered (base))
                 {
                   tp_channel_manager_emit_request_already_satisfied (
-                      TP_CHANNEL_MANAGER (self), request,
-                      TP_EXPORTABLE_CHANNEL (text_chan));
+                      TP_CHANNEL_MANAGER (self), request, base);
                 }
               else
                 {
-                  tp_base_channel_register (TP_BASE_CHANNEL (text_chan));
+                  tp_base_channel_register (base);
 
                   if (salut_muc_channel_is_ready (text_chan))
                     {
                       GSList *tokens = g_slist_append (NULL, request);
                       tp_channel_manager_emit_new_channel (
                           TP_CHANNEL_MANAGER (self),
-                          TP_EXPORTABLE_CHANNEL (text_chan), tokens);
+                          base, tokens);
                       g_slist_free (tokens);
                     }
                   else
@@ -1088,7 +1093,7 @@ invite_stanza_callback (WockyPorter *porter,
           connection, inviter_handle, FALSE, FALSE, TRUE);
 
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-          TP_EXPORTABLE_CHANNEL (chan), NULL);
+          TP_BASE_CHANNEL (chan), NULL);
     }
 
   /* FIXME handle properly */
diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c
index dd8a69dd..a94c0797 100644
--- a/src/roomlist-manager.c
+++ b/src/roomlist-manager.c
@@ -74,7 +74,7 @@ struct _SalutRoomlistManagerPrivate
 
   /* Map from channels to the request-tokens of requests that they will
    * satisfy when they're ready.
-   * Borrowed TpExportableChannel => GSList of gpointer */
+   * Borrowed TpBaseChannel => GSList of gpointer */
   GHashTable *queued_requests;
 
   gboolean dispose_has_run;
@@ -247,7 +247,7 @@ salut_roomlist_manager_finalize (GObject *object)
 
 struct _ForeachData
 {
-  TpExportableChannelFunc foreach;
+  TpBaseChannelFunc foreach;
   gpointer user_data;
 };
 
@@ -257,7 +257,7 @@ salut_roomlist_manager_foreach_one_list (TpChannelManager *chan,
                                          gpointer user_data)
 {
   struct _ForeachData *data = (struct _ForeachData *) user_data;
-  TpExportableChannel *channel = TP_EXPORTABLE_CHANNEL (chan);
+  TpBaseChannel *channel = TP_BASE_CHANNEL (chan);
 
   data->foreach (channel, data->user_data);
 }
@@ -265,7 +265,7 @@ salut_roomlist_manager_foreach_one_list (TpChannelManager *chan,
 
 static void
 salut_roomlist_manager_foreach_channel (TpChannelManager *iface,
-                                   TpExportableChannelFunc foreach,
+                                   TpBaseChannelFunc foreach,
                                    gpointer user_data)
 {
   SalutRoomlistManager *fac = SALUT_ROOMLIST_MANAGER (iface);
@@ -326,7 +326,7 @@ roomlist_channel_closed_cb (SalutRoomlistChannel *channel,
     SALUT_ROOMLIST_MANAGER_GET_PRIVATE (self);
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (channel));
+      TP_BASE_CHANNEL (channel));
 
   if (priv->roomlist_channels != NULL)
     {
@@ -416,7 +416,7 @@ salut_roomlist_manager_request (TpChannelManager *manager,
 
       tp_channel_manager_emit_request_already_satisfied (
           TP_CHANNEL_MANAGER (self), request_token,
-          TP_EXPORTABLE_CHANNEL (roomlist_channel));
+          TP_BASE_CHANNEL (roomlist_channel));
       return TRUE;
     }
 
@@ -429,7 +429,7 @@ salut_roomlist_manager_request (TpChannelManager *manager,
 
   request_tokens = g_slist_prepend (NULL, request_token);
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (roomlist_channel), request_tokens);
+      TP_BASE_CHANNEL (roomlist_channel), request_tokens);
   g_slist_free (request_tokens);
 
   return TRUE;
diff --git a/src/tubes-manager.c b/src/tubes-manager.c
index ae73a84b..91b9e263 100644
--- a/src/tubes-manager.c
+++ b/src/tubes-manager.c
@@ -348,7 +348,7 @@ iq_tube_request_cb (WockyPorter *porter,
 
     /* announce tube channel */
     tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-        TP_EXPORTABLE_CHANNEL (chan), NULL);
+        TP_BASE_CHANNEL (chan), NULL);
 
     g_hash_table_unref (parameters);
   }
@@ -538,7 +538,7 @@ salut_tubes_manager_class_init (
 
 static void
 salut_tubes_manager_foreach_channel (TpChannelManager *manager,
-                                     TpExportableChannelFunc foreach,
+                                     TpBaseChannelFunc foreach,
                                      gpointer user_data)
 {
   SalutTubesManager *fac = SALUT_TUBES_MANAGER (manager);
@@ -550,7 +550,7 @@ salut_tubes_manager_foreach_channel (TpChannelManager *manager,
   g_hash_table_iter_init (&iter, priv->tubes);
   while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      foreach (TP_EXPORTABLE_CHANNEL (value), user_data);
+      foreach (TP_BASE_CHANNEL (value), user_data);
     }
 }
 
@@ -680,7 +680,7 @@ channel_closed_cb (SalutTubeIface *tube,
       NULL);
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (tube));
+      TP_BASE_CHANNEL (tube));
 
   if (priv->tubes != NULL)
     g_hash_table_remove (priv->tubes, GUINT_TO_POINTER (id));
@@ -911,7 +911,7 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
         tokens = g_slist_prepend (NULL, request);
 
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-          TP_EXPORTABLE_CHANNEL (new_channel), tokens);
+          TP_BASE_CHANNEL (new_channel), tokens);
 
       g_slist_free (tokens);
     }
@@ -927,7 +927,7 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
 
       tp_channel_manager_emit_request_already_satisfied (
           TP_CHANNEL_MANAGER (self), request,
-          TP_EXPORTABLE_CHANNEL (new_channel));
+          TP_BASE_CHANNEL (new_channel));
     }
 
   return TRUE;