[telepathy-mission-control/master] McdChannel: expose _mcd_channel_close to the rest of MC

Simon McVittie simon.mcvittie at collabora.co.uk
Fri Jun 26 07:02:02 PDT 2009


---
 src/mcd-channel-priv.h |    2 ++
 src/mcd-channel.c      |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mcd-channel-priv.h b/src/mcd-channel-priv.h
index 574903b..e8d3a6c 100644
--- a/src/mcd-channel-priv.h
+++ b/src/mcd-channel-priv.h
@@ -74,6 +74,8 @@ void _mcd_channel_copy_details (McdChannel *channel, McdChannel *source);
 G_GNUC_INTERNAL
 void _mcd_channel_set_request_proxy (McdChannel *channel, McdChannel *source);
 
+void _mcd_channel_close (McdChannel *channel);
+
 G_END_DECLS
 #endif
 
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 9de2a7f..a87979c 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -247,8 +247,8 @@ on_channel_ready (TpChannel *tp_chan, const GError *error, gpointer user_data)
 	_mcd_channel_setup_group (channel);
 }
 
-static void
-mcd_channel_close (McdChannel *channel)
+void
+_mcd_channel_close (McdChannel *channel)
 {
     McdChannelPrivate *priv = MCD_CHANNEL_PRIV (channel);
 
@@ -311,7 +311,7 @@ _mcd_channel_release_tp_channel (McdChannel *channel, gboolean close_channel)
 					      channel);
 
 	if (close_channel)
-            mcd_channel_close (channel);
+            _mcd_channel_close (channel);
 
 	/* Destroy our proxy */
 	g_object_unref (priv->tp_chan);
@@ -553,7 +553,7 @@ mcd_channel_abort (McdMission *mission)
     /* Don't release the TpChannel, because we might still be asked to retrieve
      * its properties or object path; instead, just close the channel */
     if (priv->close_on_dispose)
-        mcd_channel_close (channel);
+        _mcd_channel_close (channel);
 
     /* chain up with the parent */
     MCD_MISSION_CLASS (mcd_channel_parent_class)->abort (mission);
-- 
1.5.6.5




More information about the telepathy-commits mailing list