[next] telepathy-rakia: Channel managers: replace TpExportableChannel with TpBaseChannel

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: e4a952363b40c0086d70aa5f92ef076ddf2e876d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=e4a952363b40c0086d70aa5f92ef076ddf2e876d

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Apr 22 14:46:35 2014 +0100

Channel managers: replace TpExportableChannel with TpBaseChannel

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77189

---

 rakia/media-manager.c |   12 ++++++------
 rakia/text-manager.c  |   16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index d8b99b4..8c6cf17 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -254,7 +254,7 @@ call_channel_closed_cb (RakiaCallChannel *chan, gpointer user_data)
     }
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (fac),
-      TP_EXPORTABLE_CHANNEL (chan));
+      TP_BASE_CHANNEL (chan));
 }
 
 /**
@@ -387,7 +387,7 @@ incoming_call_cb (RakiaSipSession *session,
       session);
 
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (idata->fac),
-      TP_EXPORTABLE_CHANNEL (channel), NULL);
+      TP_BASE_CHANNEL (channel), NULL);
 
   g_object_unref (session);
   g_slice_free (struct InviteData, idata);
@@ -489,7 +489,7 @@ rakia_media_manager_constructed (GObject *object)
 
 static void
 rakia_media_manager_foreach_channel (TpChannelManager *manager,
-                                     TpExportableChannelFunc foreach,
+                                     TpBaseChannelFunc foreach,
                                      gpointer user_data)
 {
   RakiaMediaManager *fac = RAKIA_MEDIA_MANAGER (manager);
@@ -501,7 +501,7 @@ rakia_media_manager_foreach_channel (TpChannelManager *manager,
 
   for (i = 0; i < priv->channels->len; i++)
     {
-      TpExportableChannel *channel = TP_EXPORTABLE_CHANNEL (
+      TpBaseChannel *channel = TP_BASE_CHANNEL (
           g_ptr_array_index (priv->channels, i));
 
       foreach (channel, user_data);
@@ -665,7 +665,7 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
             {
               tp_channel_manager_emit_request_already_satisfied (
                   TP_CHANNEL_MANAGER (self), request,
-                  TP_EXPORTABLE_CHANNEL (channel));
+                  TP_BASE_CHANNEL (channel));
               return TRUE;
             }
         }
@@ -678,7 +678,7 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
 
   request_tokens = g_slist_prepend (NULL, request);
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (channel), request_tokens);
+      TP_BASE_CHANNEL (channel), request_tokens);
   g_slist_free (request_tokens);
 
   return TRUE;
diff --git a/rakia/text-manager.c b/rakia/text-manager.c
index 0f0138e..fb8eb33 100644
--- a/rakia/text-manager.c
+++ b/rakia/text-manager.c
@@ -198,7 +198,7 @@ rakia_text_manager_close_all (RakiaTextManager *fac)
 
 struct _ForeachData
 {
-  TpExportableChannelFunc func;
+  TpBaseChannelFunc func;
   gpointer user_data;
 };
 
@@ -206,14 +206,14 @@ static void
 _foreach_slave (gpointer key, gpointer value, gpointer user_data)
 {
   struct _ForeachData *data = (struct _ForeachData *)user_data;
-  TpExportableChannel *chan = TP_EXPORTABLE_CHANNEL (value);
+  TpBaseChannel *chan = TP_BASE_CHANNEL (value);
 
   data->func (chan, data->user_data);
 }
 
 static void
 rakia_text_manager_foreach_channel (TpChannelManager *manager,
-                                    TpExportableChannelFunc func,
+                                    TpBaseChannelFunc func,
                                     gpointer user_data)
 {
   RakiaTextManager *fac = RAKIA_TEXT_MANAGER (manager);
@@ -257,7 +257,7 @@ channel_closed (RakiaTextChannel *chan, gpointer user_data)
       g_hash_table_remove (priv->channels, GINT_TO_POINTER (contact_handle));
       tp_channel_manager_emit_channel_closed_for_object (
           TP_CHANNEL_MANAGER (self),
-          (TpExportableChannel *) chan);
+          (TpBaseChannel *) chan);
     }
   else
     {
@@ -265,9 +265,9 @@ channel_closed (RakiaTextChannel *chan, gpointer user_data)
              contact_handle);
       tp_channel_manager_emit_channel_closed_for_object (
           TP_CHANNEL_MANAGER (self),
-          (TpExportableChannel *) chan);
+          (TpBaseChannel *) chan);
       tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-          (TpExportableChannel *) chan, NULL);
+          (TpBaseChannel *) chan, NULL);
     }
 }
 
@@ -305,7 +305,7 @@ rakia_text_manager_new_channel (RakiaTextManager *fac,
     request_tokens = NULL;
 
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (fac),
-      (TpExportableChannel *) chan, request_tokens);
+      (TpBaseChannel *) chan, request_tokens);
 
   g_slist_free (request_tokens);
 
@@ -360,7 +360,7 @@ rakia_text_manager_requestotron (RakiaTextManager *self,
   TpBaseConnection *base_conn = (TpBaseConnection *) priv->conn;
   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))