X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fconnection.py;h=c967215ab8f10de21ba9887422344008d6299a76;hp=1ad2487fa411839b331572fb44773f4db385e023;hb=a1bd487c1aec50d1f2c6379ff5a67f2da85d0be9;hpb=d4b136496c94a847232c2454a0732984aa43e56d

diff --git a/src/connection.py b/src/connection.py
index 1ad2487..c967215 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -28,6 +28,8 @@ _moduleLogger = logging.getLogger(__name__)
 
 class TheOneRingOptions(object):
 
+	ignoreDND = True
+
 	useGVContacts = True
 
 	assert gvoice.session.Session._DEFAULTS["contacts"][1] == "hours"
@@ -42,6 +44,7 @@ class TheOneRingOptions(object):
 	def __init__(self, parameters = None):
 		if parameters is None:
 			return
+		self.ignoreDND = parameters["ignore-dnd"]
 		self.useGVContacts = parameters["use-gv-contacts"]
 		self.contactsPollPeriodInHours = parameters['contacts-poll-period-in-hours']
 		self.voicemailPollPeriodInMinutes = parameters['voicemail-poll-period-in-minutes']
@@ -54,9 +57,10 @@ class TheOneRingConnection(
 	avatars.AvatarsMixin,
 	capabilities.CapabilitiesMixin,
 	contacts.ContactsMixin,
-	presence.PresenceMixin,
 	requests.RequestsMixin,
+	simple_presence.TheOneRingPresence,
 	simple_presence.SimplePresenceMixin,
+	presence.PresenceMixin,
 ):
 
 	# overiding base class variable
@@ -67,6 +71,7 @@ class TheOneRingConnection(
 	# overiding base class variable
 	_optional_parameters = {
 		'forward': 's',
+		'ignore-dnd': 'b',
 		'use-gv-contacts': 'b',
 		'contacts-poll-period-in-hours': 'i',
 		'voicemail-poll-period-in-minutes': 'i',
@@ -74,6 +79,7 @@ class TheOneRingConnection(
 	}
 	_parameter_defaults = {
 		'forward': '',
+		'ignore-dnd': TheOneRingOptions.ignoreDND,
 		'use-gv-contacts': TheOneRingOptions.useGVContacts,
 		'contacts-poll-period-in-hours': TheOneRingOptions.contactsPollPeriodInHours,
 		'voicemail-poll-period-in-minutes': TheOneRingOptions.voicemailPollPeriodInMinutes,
@@ -97,14 +103,8 @@ class TheOneRingConnection(
 
 		# Connection init must come first
 		self.__options = TheOneRingOptions(parameters)
-		self.__session = gvoice.session.Session(
-			cookiePath = None,
-			defaults = {
-				"contacts": (self.__options.contactsPollPeriodInHours, "hours"),
-				"voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
-				"texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
-			},
-		)
+		self.__accountName = account
+		self.__session = None
 		tp.Connection.__init__(
 			self,
 			constants._telepathy_protocol_name_,
@@ -115,9 +115,10 @@ class TheOneRingConnection(
 		avatars.AvatarsMixin.__init__(self)
 		capabilities.CapabilitiesMixin.__init__(self)
 		contacts.ContactsMixin.__init__(self)
-		presence.PresenceMixin.__init__(self)
 		requests.RequestsMixin.__init__(self)
-		simple_presence.SimplePresenceMixin.__init__(self)
+		simple_presence.TheOneRingPresence.__init__(self, self.__options.ignoreDND)
+		simple_presence.SimplePresenceMixin.__init__(self, self)
+		presence.PresenceMixin.__init__(self, self)
 
 		self.__manager = weakref.proxy(manager)
 		self.__credentials = (
@@ -209,6 +210,16 @@ class TheOneRingConnection(
 		"""
 		For org.freedesktop.telepathy.Connection
 		"""
+		if self.__session is None:
+			self.__session = gvoice.session.Session(
+				cookiePath = os.path.join(constants._data_path_, "%s.cookies" % self.__accountName),
+				defaults = {
+					"contacts": (self.__options.contactsPollPeriodInHours, "hours"),
+					"voicemail": (self.__options.voicemailPollPeriodInMinutes, "minutes"),
+					"texts": (self.__options.textsPollPeriodInMinutes, "minutes"),
+				},
+			)
+
 		if self._status != telepathy.CONNECTION_STATUS_DISCONNECTED:
 			_moduleLogger.info("Attempting connect when not disconnected")
 			return
@@ -229,7 +240,7 @@ class TheOneRingConnection(
 	def _on_login(self, *args):
 		_moduleLogger.info("Connected, setting up...")
 		try:
-			self.__session.load(self.__cachePath)
+			self.session.load(self.__cachePath)
 
 			for plumber in self._plumbing:
 				plumber.start()
@@ -243,9 +254,6 @@ class TheOneRingConnection(
 			subscribeHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "subscribe")
 			subscribeProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, subscribeHandle, False)
 			self.__channelManager.channel_for_props(subscribeProps, signal=True)
-			publishHandle = self.get_handle_by_name(telepathy.HANDLE_TYPE_LIST, "publish")
-			publishProps = self.generate_props(telepathy.CHANNEL_TYPE_CONTACT_LIST, publishHandle, False)
-			self.__channelManager.channel_for_props(publishProps, signal=True)
 		except Exception:
 			_moduleLogger.exception("Setup failed")
 			self.disconnect(telepathy.CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED)
@@ -331,7 +339,7 @@ class TheOneRingConnection(
 		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