import constants
import tp
-import util.go_utils as gobject_utils
import util.misc as misc_utils
import gvoice
@misc_utils.log_exception(_moduleLogger)
def __init__(self, manager, parameters):
+ self._loggers = []
+
self.check_parameters(parameters)
account = unicode(parameters['account'])
encodedAccount = parameters['account'].encode('utf-8')
# Connection init must come first
self.__options = TheOneRingOptions(parameters)
self.__session = gvoice.session.Session(
- cookiePath = None,
+ cookiePath = os.path.join(constants._data_path_, "%s.cookies" % account),
defaults = {
"contacts": (self.__options.contactsPollPeriodInHours, "hours"),
"voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
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:
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
+ def log_to_user(self, component, message):
+ for logger in self._loggers:
+ logger.log_message(component, message)
+
+ def add_logger(self, logger):
+ self._loggers.append(logger)
+
+ def remove_logger(self, logger):
+ self._loggers.remove(logger)
+
@property
def _channel_manager(self):
return self.__channelManager
)
@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)
@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)
self.manager.disconnected(self)
self.session.save(self.__cachePath)
- self.session.logout()
+ self.session.shutdown()
self.session.close()
# In case one of the above items takes too long (which it should never