Combinging disconnect code to try and minimize errors with the logic

[theonering] / src / autogv.py

diff --git a/src/autogv.py b/src/autogv.py
index 4c93132..0a960c8 100644 (file)
--- a/src/autogv.py
+++ b/src/autogv.py
@@ -54,7 +54,7 @@ class NewGVConversations(object):
                        h = self._connRef().get_handle_by_name(telepathy.HANDLE_TYPE_CONTACT, phoneNumber)
                        # Just let the TextChannel decide whether it should be reported to the user or not
                        props = self._connRef().generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False)
-                       if self._channel_manager.channel_exists(props):
+                       if self._connRef()._channel_manager.channel_exists(props):
                                continue
 
                        # Maemo 4.1's RTComm opens a window for a chat regardless if a
@@ -68,7 +68,7 @@ class NewGVConversations(object):
                        if not unreadConvs:
                                continue
 
-                       chan = self._channel_manager.channel_for_props(props, signal=True)
+                       chan = self._connRef()._channel_manager.channel_for_props(props, signal=True)
 
 
 class RefreshVoicemail(object):
@@ -174,13 +174,9 @@ class AutoDisconnect(object):
                        _moduleLogger.info("Received connection change event when not logged in")
                        return
                try:
-                       self._connRef().disconnect()
+                       self._connRef().disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
                except Exception:
                        _moduleLogger.exception("Error durring disconnect")
-               self._connRef().StatusChanged(
-                       telepathy.CONNECTION_STATUS_DISCONNECTED,
-                       telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR
-               )
                self.__delayedDisconnectEventId = None
                return False