[Telepathy-commits] [telepathy-salut/master] ft-manager: add file_channel_closed function

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Feb 6 07:24:42 PST 2009


---
 src/salut-ft-manager.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/salut-ft-manager.c b/src/salut-ft-manager.c
index e540495..1f3f765 100644
--- a/src/salut-ft-manager.c
+++ b/src/salut-ft-manager.c
@@ -225,9 +225,9 @@ salut_ft_manager_foreach_channel (TpChannelManager *iface,
 }
 
 static void
-file_channel_closed_cb (SalutFileTransferChannel *chan, gpointer user_data)
+file_channel_closed (SalutFtManager *self,
+                     SalutFileTransferChannel *chan)
 {
-  SalutFtManager *self = SALUT_FT_MANAGER (user_data);
   SalutFtManagerPrivate *priv = SALUT_FT_MANAGER_GET_PRIVATE (self);
   TpHandle handle;
 
@@ -240,6 +240,14 @@ file_channel_closed_cb (SalutFileTransferChannel *chan, gpointer user_data)
     }
 }
 
+static void
+file_channel_closed_cb (SalutFileTransferChannel *chan, gpointer user_data)
+{
+  SalutFtManager *self = SALUT_FT_MANAGER (user_data);
+
+  file_channel_closed (self, chan);
+}
+
 static SalutFileTransferChannel *
 salut_ft_manager_new_channel (SalutFtManager *mgr,
                               TpHandle handle,
@@ -452,7 +460,7 @@ salut_ft_manager_handle_request (TpChannelManager *manager,
     {
       /* Pretend the chan was closed so it's removed from the channels
        * list and unreffed. */
-      file_channel_closed_cb (chan, self);
+      file_channel_closed (self, chan);
       goto error;
     }
 
-- 
1.5.6.5



More information about the telepathy-commits mailing list