Lots of work in prep for conversations to work

[theonering] / src / channel / contact_list.py

diff --git a/src/channel/contact_list.py b/src/channel/contact_list.py
index e2a8493..970b809 100644 (file)
--- a/src/channel/contact_list.py
+++ b/src/channel/contact_list.py
@@ -4,6 +4,7 @@ import telepathy
 
 import util.go_utils as gobject_utils
 import util.coroutines as coroutines
+import gtk_toolbox
 import handle
 
 
@@ -39,6 +40,14 @@ class AllContactsListChannel(AbstractListChannel):
                contacts = addressbook.get_contacts()
                self._process_refresh(addressbook, contacts, [])
 
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def Close(self):
+               telepathy.server.ChannelTypeContactList.Close(self)
+               self.remove_from_connection()
+               self._session.addressbook.updateSignalHandler.unregister_sink(
+                       self._on_contacts_refreshed
+               )
+
        @coroutines.func_sink
        @coroutines.expand_positional
        @gobject_utils.async