X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=6ff64d8b59928e903a6b677054feaf2fb063c0aa;hp=2fd3632d153acaaadf2160cf8cb0937b8e438c88;hb=00b3702cd38fb5654609f9a822c660928b977ef7;hpb=5a9e15edc57b063b41b40aa9f4143713ccae9bc1

diff --git a/src/connection.py b/src/connection.py
index 2fd3632..6ff64d8 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -7,13 +7,12 @@ import constants
 import gvoice
 import handle
 import channel_manager
-import simple_presence
 
 
 _moduleLogger = logging.getLogger("connection")
 
 
-class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePresenceMixin):
+class TheOneRingConnection(telepathy.server.Connection):
 
 	MANDATORY_PARAMETERS = {
 		'account' : 's',
@@ -46,8 +45,7 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr
 			self._channelManager = channel_manager.ChannelManager(self)
 
 			cookieFilePath = "%s/cookies.txt" % constants._data_path_
-			self._backend = gvoice.dialer.GVDialer(cookieFilePath)
-			self._addressbook = gvoice.addressbook.Addressbook(self._backend)
+			self._session = gvoice.session.Session(cookieFilePath)
 
 			self.set_self_handle(handle.create_handle(self, 'connection'))
 
@@ -61,12 +59,8 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr
 		return self._manager
 
 	@property
-	def gvoice_backend(self):
-		return self._backend
-
-	@property
-	def addressbook(self):
-		return self._addressbook
+	def session(self):
+		return self._session
 
 	@property
 	def username(self):
@@ -85,9 +79,9 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr
 			telepathy.CONNECTION_STATUS_REASON_REQUESTED
 		)
 		try:
-			self._backend.login(*self._credentials)
-			self._backend.set_callback_number(self._callbackNumber)
-		except gvoice.dialer.NetworkError:
+			self.session.login(*self._credentials)
+			self.session.backend.set_callback_number(self._callbackNumber)
+		except gvoice.backend.NetworkError:
 			self.StatusChanged(
 				telepathy.CONNECTION_STATUS_DISCONNECTED,
 				telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR
@@ -108,7 +102,7 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr
 		For org.freedesktop.telepathy.Connection
 		"""
 		try:
-			self._backend.logout()
+			self.session.logout()
 			_moduleLogger.info("Disconnected")
 		except Exception:
 			_moduleLogger.exception("Disconnecting Failed")
@@ -171,7 +165,7 @@ class TheOneRingConnection(telepathy.server.Connection, simple_presence.SimplePr
 	def _create_contact_handle(self, name):
 		requestedContactId = name
 
-		contacts = self._addressbook.get_contacts()
+		contacts = self.session.addressbook.get_contacts()
 		contactsFound = [
 			contactId for contactId in contacts
 			if contactId == requestedContactId