[telepathy-mission-control/master] If HandleChannels fails, Destroy the channels if possible

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


Previously we'd "abort" the channels, which conflates Close() and unref.
Now, the channels will get aborted and unreffed when they emit Closed.
---
 src/mcd-dispatcher.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 95ed126..ec88157 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -655,8 +655,8 @@ handle_channels_cb (TpClient *proxy, const GError *error, gpointer user_data,
                                    channel, mc_error);
 
             /* FIXME: try to dispatch the channels to another handler, instead
-             * of just aborting them? */
-            mcd_mission_abort (MCD_MISSION (channel));
+             * of just destroying them? */
+            _mcd_channel_undispatchable (channel);
         }
         g_error_free (mc_error);
     }
-- 
1.5.6.5




More information about the telepathy-commits mailing list