[telepathy-mission-control/master] McdHandlerMap: call _mcd_channel_close instead of mcd_mission_abort
Simon McVittie
simon.mcvittie at collabora.co.uk
Fri Jun 26 07:03:30 PDT 2009
This will eventually let us get away from the "abort => Close"
anti-pattern.
---
src/mcd-handler-map.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mcd-handler-map.c b/src/mcd-handler-map.c
index 7aa4b3a..bcacf8a 100644
--- a/src/mcd-handler-map.c
+++ b/src/mcd-handler-map.c
@@ -24,6 +24,7 @@
*/
#include "config.h"
+#include "mcd-channel-priv.h"
#include "mcd-handler-map-priv.h"
#include <telepathy-glib/util.h>
@@ -262,8 +263,9 @@ _mcd_handler_map_set_handler_crashed (McdHandlerMap *self,
if (channel != NULL)
{
- DEBUG ("Aborting channel %s", path);
- mcd_mission_abort ((McdMission *) channel);
+ DEBUG ("Closing channel %s", path);
+ /* channel will get aborted when it actually closes */
+ _mcd_channel_close (channel);
}
else
{
--
1.5.6.5
More information about the telepathy-commits
mailing list