[telepathy-mission-control/master] Allow state change from FAILED to ABORTED
Alberto Mardegan
alberto.mardegan at nokia.com
Mon Sep 14 05:23:43 PDT 2009
---
src/mcd-channel.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 92ba46b..ec2e6d3 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -848,7 +848,9 @@ _mcd_channel_set_status (McdChannel *channel, McdChannelStatus status)
if (status != channel->priv->status)
{
- g_return_if_fail (channel->priv->status != MCD_CHANNEL_STATUS_FAILED);
+ if (status != MCD_CHANNEL_STATUS_ABORTED)
+ g_return_if_fail (channel->priv->status !=
+ MCD_CHANNEL_STATUS_FAILED);
g_object_ref (channel);
g_signal_emit_by_name (channel, "status-changed", status);
g_object_unref (channel);
--
1.5.6.5
More information about the telepathy-commits
mailing list