[telepathy-gabble/master] inline file_channel_closed inside file_channel_closed_cb

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Mar 30 04:18:48 PDT 2009


---
 src/ft-manager.c |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/ft-manager.c b/src/ft-manager.c
index 6580838..309a2c7 100644
--- a/src/ft-manager.c
+++ b/src/ft-manager.c
@@ -214,10 +214,12 @@ gabble_ft_manager_foreach_channel (TpChannelManager *iface,
 }
 
 static void
-file_channel_closed (GabbleFtManager *self,
-                     GabbleFileTransferChannel *chan)
+file_channel_closed_cb (GabbleFileTransferChannel *chan,
+                        gpointer user_data)
 {
-  if (self->priv->channels)
+  GabbleFtManager *self = GABBLE_FT_MANAGER (user_data);
+
+  if (self->priv->channels != NULL)
     {
       gchar *path, *id;
 
@@ -235,15 +237,6 @@ file_channel_closed (GabbleFtManager *self,
 }
 
 static void
-file_channel_closed_cb (GabbleFileTransferChannel *chan,
-                        gpointer user_data)
-{
-  GabbleFtManager *self = GABBLE_FT_MANAGER (user_data);
-
-  file_channel_closed (self, chan);
-}
-
-static void
 gabble_ft_manager_channel_created (GabbleFtManager *self,
                                    GabbleFileTransferChannel *chan,
                                    gpointer request_token)
-- 
1.5.6.5




More information about the telepathy-commits mailing list