[Telepathy-commits] [telepathy-mission-control/master] Update the condition with the new channel status

Alberto Mardegan alberto.mardegan at nokia.com
Wed Jan 7 04:52:19 PST 2009


---
 src/mcd-connection.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index a487274..3d509eb 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -559,10 +559,13 @@ on_capabilities_timeout (McdConnection *connection)
     while (list)
     {
         McdChannel *channel = MCD_CHANNEL (list->data);
+        McdChannelStatus status;
 
 	list_curr = list;
 	list = list->next;
-        if (mcd_channel_get_status (channel) == MCD_CHANNEL_STATUS_REQUEST &&
+        status = mcd_channel_get_status (channel);
+        if ((status == MCD_CHANNEL_STATUS_REQUEST ||
+             status == MCD_CHANNEL_STATUS_REQUESTED) &&
             on_channel_capabilities_timeout (channel, connection))
 	{
             mcd_mission_abort ((McdMission *)channel);
-- 
1.5.6.5




More information about the Telepathy-commits mailing list