[telepathy-python/master] Fix ChannelManager.close() to iter channel correcty

Olivier Le Thanh Duong olivier at lethanh.be
Mon Jan 4 06:28:40 PST 2010


---
 src/server/channelmanager.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/server/channelmanager.py b/src/server/channelmanager.py
index e603c02..4a1682b 100644
--- a/src/server/channelmanager.py
+++ b/src/server/channelmanager.py
@@ -34,11 +34,12 @@ class ChannelManager(object):
 
     def close(self):
         for channel_type in self._requestable_channel_classes:
-            for channel in self._channels[channel_type].values():
-                if channel._type == CHANNEL_TYPE_CONTACT_LIST:
-                    channel.remove_from_connection()
-                else:
-                    channel.Close()
+            for channels in self._channels[channel_type].values():
+                for channel in channels:
+                    if channel._type == CHANNEL_TYPE_CONTACT_LIST:
+                        channel.remove_from_connection()
+                    else:
+                        channel.Close()
 
     def remove_channel(self, channel):
         for channel_type in self._requestable_channel_classes:
-- 
1.5.6.5




More information about the telepathy-commits mailing list