Imitiating buttfly in being explicitly typed

[theonering] / src / connection.py

diff --git a/src/connection.py b/src/connection.py
index 0f43867..59ffa76 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -6,7 +6,6 @@ import telepathy
 
 import constants
 import tp
-import util.go_utils as gobject_utils
 import util.misc as misc_utils
 
 import gvoice
@@ -167,6 +166,12 @@ class TheOneRingConnection(
 
        def get_handle_by_name(self, handleType, handleName):
                requestedHandleName = handleName.encode('utf-8')
+
+               # We need to return an existing or create a new handle.  Unfortunately
+               # handle init's take care of normalizing the handle name.  So we have
+               # to create a new handle regardless and burn some handle id's and burn
+               # some extra memory of creating objects we throw away if the handle
+               # already exists.
                if handleType == telepathy.HANDLE_TYPE_CONTACT:
                        h = handle.create_handle(self, 'contact', requestedHandleName)
                elif handleType == telepathy.HANDLE_TYPE_LIST:
@@ -174,6 +179,13 @@ class TheOneRingConnection(
                        h = handle.create_handle(self, 'list', requestedHandleName)
                else:
                        raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
+
+               for candidate in self._handles.itervalues():
+                       if candidate.get_name() == h.get_name():
+                               h = candidate
+                               _moduleLogger.debug("Re-used handle for %s, I hoped this helped" % handleName)
+                               break
+
                return h
 
        @property
@@ -202,7 +214,7 @@ class TheOneRingConnection(
                )
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_login(self):
+       def _on_login(self, *args):
                _moduleLogger.info("Connected, setting up...")
                try:
                        self.__session.load(self.__cachePath)
@@ -236,7 +248,9 @@ class TheOneRingConnection(
        @misc_utils.log_exception(_moduleLogger)
        def _on_login_error(self, error):
                _moduleLogger.error(error)
-               if isinstance(error, gvoice.backend.NetworkError):
+               if isinstance(error, StopIteration):
+                       pass
+               elif isinstance(error, gvoice.backend.NetworkError):
                        self.disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
                else:
                        self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED)