summaryrefslogtreecommitdiff
path: root/src/mcd-channel.c
diff options
context:
space:
mode:
authorAlberto Mardegan <alberto.mardegan@nokia.com>2009-09-14 15:23:43 +0300
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2009-09-16 14:36:42 +0100
commit409d661facabcf8c77fcdf6799e9f13d24319e73 (patch)
tree4c524fa762743851e8a76ad8a9b7b1a5ed34fdd6 /src/mcd-channel.c
parent0562797448b87694d6513acb66c08ee5fbe17687 (diff)
downloadtelepathy-mission-control-409d661facabcf8c77fcdf6799e9f13d24319e73.tar.gz
Allow state change from FAILED to ABORTED
Diffstat (limited to 'src/mcd-channel.c')
-rw-r--r--src/mcd-channel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 92ba46b8..ec2e6d3b 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);