Replace TpExportableChannel with TpBaseChannel

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

4 files changed, 26 insertions, 26 deletions

diff --git a/src/idle-im-manager.c b/src/idle-im-manager.c
index 6984484..622226c 100644
--- a/src/idle-im-manager.c
+++ b/src/idle-im-manager.c
@@ -73,7 +73,7 @@ static IdleParserHandlerResult _notice_privmsg_handler(IdleParser *parser, IdleP
 static void _im_manager_close_all(IdleIMManager *manager);
 static void connection_status_changed_cb (IdleConnection* conn, guint status, guint reason, IdleIMManager *self);
 
-static void _im_manager_foreach(TpChannelManager *manager, TpExportableChannelFunc func, gpointer user_data);
+static void _im_manager_foreach(TpChannelManager *manager, TpBaseChannelFunc func, gpointer user_data);
 static void _im_manager_type_foreach_class (GType type, TpChannelManagerTypeChannelClassFunc func, gpointer user_data);
 
 //static TpChannelManagerRequestStatus _iface_request(TpChannelFactoryIface *iface, const gchar *chan_type, TpEntityType entity_type, guint handle, gpointer request, TpChannelIface **new_chan, GError **error);
@@ -227,7 +227,7 @@ static void connection_status_changed_cb (IdleConnection* conn,
 }
 
 struct _ForeachHelperData {
-	TpExportableChannelFunc func;
+	TpBaseChannelFunc func;
 	gpointer user_data;
 };
 
@@ -236,7 +236,7 @@ static void _foreach_helper(gpointer key, gpointer value, gpointer user_data) {
 	data->func(value, data->user_data);
 }
 
-static void _im_manager_foreach(TpChannelManager *manager, TpExportableChannelFunc func, gpointer user_data) {
+static void _im_manager_foreach(TpChannelManager *manager, TpBaseChannelFunc func, gpointer user_data) {
 	IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE(manager);
 	struct _ForeachHelperData data = {func, user_data};
 
@@ -308,7 +308,7 @@ _im_manager_requestotron (IdleIMManager *self,
 		tp_base_connection_get_handles (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))
@@ -377,7 +377,7 @@ _im_channel_closed_cb (IdleIMChannel *chan,
 	TpBaseChannel *base = TP_BASE_CHANNEL (chan);
 
 	tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-													   TP_EXPORTABLE_CHANNEL (chan));
+													   base);
 
 	if (priv->channels)
 	{
@@ -391,7 +391,7 @@ _im_channel_closed_cb (IdleIMChannel *chan,
 			IDLE_DEBUG ("reopening channel with handle %u due to pending messages",
 				handle);
 			tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-				(TpExportableChannel *) chan, NULL);
+				base, NULL);
 		}
 	}
 }
@@ -430,7 +430,7 @@ _im_manager_new_channel (IdleIMManager *mgr,
 		requests = g_slist_prepend (requests, request);
 
 	tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (mgr),
-      TP_EXPORTABLE_CHANNEL (chan), requests);
+      TP_BASE_CHANNEL (chan), requests);
 
 	g_slist_free (requests);
 
diff --git a/src/idle-muc-manager.c b/src/idle-muc-manager.c
index 29f8ed9..a6f67ab 100644
--- a/src/idle-muc-manager.c
+++ b/src/idle-muc-manager.c
@@ -285,7 +285,7 @@ static IdleParserHandlerResult _invite_handler(IdleParser *parser, IdleParserMes
 
 	if (!chan) {
 		chan = _muc_manager_new_channel(manager, room_handle, inviter_handle, FALSE);
-		tp_channel_manager_emit_new_channel(TP_CHANNEL_MANAGER (user_data), (TpExportableChannel *) chan, NULL);
+		tp_channel_manager_emit_new_channel(TP_CHANNEL_MANAGER (user_data), (TpBaseChannel *) chan, NULL);
 		idle_muc_channel_invited(chan, inviter_handle);
 	}
 
@@ -399,7 +399,7 @@ struct _ChannelRenameForeachData {
 	TpHandle old_handle, new_handle;
 };
 
-static void _channel_rename_foreach(TpExportableChannel *channel, gpointer user_data) {
+static void _channel_rename_foreach(TpBaseChannel *channel, gpointer user_data) {
 	IdleMUCChannel *muc_chan = IDLE_MUC_CHANNEL(channel);
 	ChannelRenameForeachData *data = user_data;
 
@@ -485,7 +485,7 @@ struct _ChannelQuitForeachData {
 	const gchar *message;
 };
 
-static void _channel_quit_foreach(TpExportableChannel *channel, gpointer user_data) {
+static void _channel_quit_foreach(TpBaseChannel *channel, gpointer user_data) {
 	IdleMUCChannel *muc_chan = IDLE_MUC_CHANNEL(channel);
 	ChannelQuitForeachData *data = user_data;
 
@@ -594,7 +594,7 @@ static void _muc_manager_add_handlers(IdleMUCManager *manager)
 static void
 _muc_manager_foreach_channel (
     TpChannelManager *iface,
-    TpExportableChannelFunc func,
+    TpBaseChannelFunc func,
     gpointer user_data)
 {
   IdleMUCManagerPrivate *priv = IDLE_MUC_MANAGER_GET_PRIVATE (iface);
@@ -610,7 +610,7 @@ _muc_manager_foreach_channel (
 
       g_hash_table_iter_init (&iter, priv->channels);
       while (g_hash_table_iter_next (&iter, NULL, &v))
-        func (TP_EXPORTABLE_CHANNEL (v), user_data);
+        func (TP_BASE_CHANNEL (v), user_data);
     }
 }
 
@@ -690,7 +690,7 @@ static void _channel_closed_cb(IdleMUCChannel *chan, gpointer user_data) {
 	g_slist_free(reqs);
 
 	tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (manager),
-		TP_EXPORTABLE_CHANNEL (chan));
+		base);
 
 	if (priv->channels) {
 		TpHandle handle = tp_base_channel_get_target_handle (base);
@@ -698,7 +698,7 @@ static void _channel_closed_cb(IdleMUCChannel *chan, gpointer user_data) {
 		if (tp_base_channel_is_destroyed (base))
 			g_hash_table_remove(priv->channels, GUINT_TO_POINTER(handle));
 		else
-			tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), TP_EXPORTABLE_CHANNEL (chan),
+			tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), base,
 				NULL);
 	}
 }
@@ -713,7 +713,7 @@ static void _channel_join_ready_cb(IdleMUCChannel *chan, guint err, gpointer use
 	GSList *l;
 
 	if (err == MUC_CHANNEL_JOIN_ERROR_NONE) {
-		tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), (TpExportableChannel *) chan, reqs);
+		tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (manager), (TpBaseChannel *) chan, reqs);
 		goto out;
 	}
 
@@ -826,7 +826,7 @@ _muc_manager_request (
         {
           tp_channel_manager_emit_request_already_satisfied (
               TP_CHANNEL_MANAGER (self),
-              request, TP_EXPORTABLE_CHANNEL (channel));
+              request, TP_BASE_CHANNEL (channel));
           return TRUE;
         }
     }
diff --git a/src/idle-roomlist-manager.c b/src/idle-roomlist-manager.c
index 8a9f083..47eace1 100644
--- a/src/idle-roomlist-manager.c
+++ b/src/idle-roomlist-manager.c
@@ -66,7 +66,7 @@ struct _IdleRoomlistManagerPrivate
 static void _roomlist_manager_close_all (IdleRoomlistManager *self);
 static void connection_status_changed_cb (IdleConnection* conn, guint status, guint reason, IdleRoomlistManager *self);
 
-static void _roomlist_manager_foreach (TpChannelManager *self, TpExportableChannelFunc func, gpointer user_data);
+static void _roomlist_manager_foreach (TpChannelManager *self, TpBaseChannelFunc func, gpointer user_data);
 static void _roomlist_manager_foreach_class (TpChannelManager *self, TpChannelManagerChannelClassFunc func, gpointer user_data);
 
 static gboolean _roomlist_manager_create_channel (TpChannelManager *self, TpChannelManagerRequest *request, GHashTable *request_properties);
@@ -217,7 +217,7 @@ connection_status_changed_cb (IdleConnection* conn,
 
 static void
 _roomlist_manager_foreach (TpChannelManager *manager,
-                           TpExportableChannelFunc func,
+                           TpBaseChannelFunc func,
                            gpointer user_data)
 {
     IdleRoomlistManager *self = IDLE_ROOMLIST_MANAGER (manager);
@@ -229,7 +229,7 @@ _roomlist_manager_foreach (TpChannelManager *manager,
         return;
       }
 
-    func (TP_EXPORTABLE_CHANNEL (priv->channel), user_data);
+    func (TP_BASE_CHANNEL (priv->channel), user_data);
 }
 
 
@@ -316,7 +316,7 @@ _roomlist_manager_requestotron (IdleRoomlistManager *self,
     }
 
   tp_channel_manager_emit_request_already_satisfied (TP_CHANNEL_MANAGER (self),
-      request, TP_EXPORTABLE_CHANNEL (priv->channel));
+      request, TP_BASE_CHANNEL (priv->channel));
   return TRUE;
 
 error:
@@ -335,7 +335,7 @@ _roomlist_channel_closed_cb (IdleRoomlistChannel *chan,
   IdleRoomlistManagerPrivate *priv = self->priv;
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (chan));
+      TP_BASE_CHANNEL (chan));
 
   if (priv->channel)
     {
@@ -366,7 +366,7 @@ _roomlist_manager_new_channel (IdleRoomlistManager *self,
     requests = g_slist_prepend (requests, request);
 
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (chan), requests);
+      TP_BASE_CHANNEL (chan), requests);
 
   g_slist_free (requests);
 
diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
index bce2c6f..a6f6c12 100644
--- a/src/server-tls-manager.c
+++ b/src/server-tls-manager.c
@@ -184,7 +184,7 @@ server_tls_channel_closed_cb (IdleServerTLSChannel *channel,
     }
 
   tp_channel_manager_emit_channel_closed_for_object (TP_CHANNEL_MANAGER (self),
-      TP_EXPORTABLE_CHANNEL (channel));
+      TP_BASE_CHANNEL (channel));
   g_object_unref (channel);
 }
 
@@ -275,7 +275,7 @@ idle_server_tls_manager_verify_async (IdleServerTLSManager *self,
 
   /* emit NewChannel on the ChannelManager iface */
   tp_channel_manager_emit_new_channel (TP_CHANNEL_MANAGER (self),
-      (TpExportableChannel *) self->priv->channel, NULL);
+      (TpBaseChannel *) self->priv->channel, NULL);
 }
 
 gboolean
@@ -367,14 +367,14 @@ idle_server_tls_manager_class_init (IdleServerTLSManagerClass *klass)
 
 static void
 idle_server_tls_manager_foreach_channel (TpChannelManager *manager,
-    TpExportableChannelFunc func,
+    TpBaseChannelFunc func,
     gpointer user_data)
 {
   IdleServerTLSManager *self = IDLE_SERVER_TLS_MANAGER (manager);
   GList *l;
 
   if (self->priv->channel != NULL)
-    func (TP_EXPORTABLE_CHANNEL (self->priv->channel), user_data);
+    func (TP_BASE_CHANNEL (self->priv->channel), user_data);
 
   for (l = self->priv->completed_channels; l != NULL; l = l->next)
     {