X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fconnection.py;h=eafaacf74ac6b7f9f238f4b4a2b225d5eb3a9fad;hb=09b976df8de7c4af663797cdac386f7f329e3a09;hp=cc983632a9cfb9febb947494c0386c1d8b58c6ea;hpb=d079b698c676f1ef3f05d8b553d9e09c32699a7d;p=theonering

diff --git a/src/connection.py b/src/connection.py
index cc98363..eafaacf 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -1,7 +1,6 @@
 
 """
 @todo Add params for different state machines update times
-@todo Add option to use screen name as callback
 @todo Get a callback for missed calls to force an update of the voicemail state machine
 @todo Get a callback on an incoming call and if its from GV, auto-pickup
 @todo Decide if we should do what the spec suggests and hold onto a singleton contactlist
@@ -77,6 +76,7 @@ class TheOneRingConnection(
 			raise telepathy.errors.InvalidArgument("Invalid forwarding number")
 
 		# Connection init must come first
+		self.__session = gvoice.session.Session(None)
 		tp.Connection.__init__(
 			self,
 			constants._telepathy_protocol_name_,
@@ -98,7 +98,6 @@ class TheOneRingConnection(
 		self.__callbackNumberParameter = encodedCallback
 		self.__channelManager = channel_manager.ChannelManager(self)
 
-		self.__session = gvoice.session.Session(None)
 		if conic is not None:
 			self.__connection = conic.Connection()
 			self.__connectionEventId = None
@@ -137,17 +136,7 @@ class TheOneRingConnection(
 		requestedHandleName = handleName.encode('utf-8')
 		if handleType == telepathy.HANDLE_TYPE_CONTACT:
 			_moduleLogger.info("get_handle_by_name Contact: %s" % requestedHandleName)
-			requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
-				requestedHandleName
-			)
-			if not requestedContactId:
-				# Sometimes GV doesn't give us a contactid for contacts, so
-				# let's slow things down just a tad for better consistency for
-				# the user
-				ids = list(self.session.addressbook.find_contacts_with_number(requestedContactNumber))
-				if ids:
-					requestedContactId = ids[0]
-			h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
+			h = handle.create_handle(self, 'contact', requestedHandleName)
 		elif handleType == telepathy.HANDLE_TYPE_LIST:
 			# Support only server side (immutable) lists
 			_moduleLogger.info("get_handle_by_name List: %s" % requestedHandleName)
@@ -171,8 +160,6 @@ class TheOneRingConnection(
 			telepathy.CONNECTION_STATUS_REASON_REQUESTED
 		)
 		try:
-			cookieFilePath = None
-			self.__session = gvoice.session.Session(cookieFilePath)
 			self.__session.load(self.__cachePath)
 
 			self.__callback = coroutines.func_sink(
@@ -292,9 +279,8 @@ class TheOneRingConnection(
 	@gtk_toolbox.log_exception(_moduleLogger)
 	def _on_conversations_updated(self, conv, conversationIds):
 		_moduleLogger.debug("Incoming messages from: %r" % (conversationIds, ))
-		for contactId, phoneNumber in conversationIds:
-			handleName = handle.ContactHandle.to_handle_name(contactId, phoneNumber)
-			h = self.get_handle_by_name(telepathy.HANDLE_TYPE_CONTACT, handleName)
+		for phoneNumber in conversationIds:
+			h = self.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._generate_props(telepathy.CHANNEL_TYPE_TEXT, h, False)
 			chan = self.__channelManager.channel_for_props(props, signal=True)
@@ -303,6 +289,8 @@ class TheOneRingConnection(
 	def _on_connection_change(self, connection, event):
 		"""
 		@note Maemo specific
+
+		@todo Make this delayed to handle background switching of networks
 		"""
 		status = event.get_status()
 		error = event.get_error()