X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=inline;f=src%2Fautogv.py;h=6c7f3cc6b0cdaf72580324b5952808b8eb67bc88;hb=40830dbb5b708c02bf56cc1a1557b34dbf7d70fc;hp=525ecaf315a53f25e2745aabf25eae52ea9b5e1d;hpb=131378064035e5d9527adc85fd7ff5da05ed8cdb;p=theonering

diff --git a/src/autogv.py b/src/autogv.py
index 525ecaf..6c7f3cc 100644
--- a/src/autogv.py
+++ b/src/autogv.py
@@ -1,5 +1,6 @@
 import logging
 
+import dbus
 import telepathy
 
 try:
@@ -22,7 +23,7 @@ import util.misc as misc_utils
 import gvoice
 
 
-_moduleLogger = logging.getLogger("autogv")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class NewGVConversations(object):
@@ -118,7 +119,11 @@ class RefreshVoicemail(object):
 			return
 
 		conn = telepathy.client.Connection(serviceName, connObjectPath)
-		chan = telepathy.client.Channel(serviceName, channelObjectPath)
+		try:
+			chan = telepathy.client.Channel(serviceName, channelObjectPath)
+		except dbus.exceptions.UnknownMethodException:
+			_moduleLogger.exception("Client might not have implemented a deprecated method")
+			return
 		missDetection = telepathy_utils.WasMissedCall(
 			bus, conn, chan, self._on_missed_call, self._on_error_for_missed
 		)
@@ -136,6 +141,24 @@ class RefreshVoicemail(object):
 		self._outstandingRequests.remove(missDetection)
 
 
+class TimedDisconnect(object):
+
+	def __init__(self, connRef):
+		self._connRef = connRef
+		self.__delayedDisconnect = gobject_utils.Timeout(self._on_delayed_disconnect)
+
+	def start(self):
+		self.__delayedDisconnect.start(seconds=60)
+
+	def stop(self):
+		self.__delayedDisconnect.cancel()
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_delayed_disconnect(self):
+		_moduleLogger.info("Timed disconnect occurred")
+		self._connRef().disconnect(telepathy.CONNECTION_STATUS_REASON_NETWORK_ERROR)
+
+
 class AutoDisconnect(object):
 
 	def __init__(self, connRef):
@@ -174,6 +197,7 @@ class AutoDisconnect(object):
 		else:
 			_moduleLogger.info("Other status: %r" % (status, ))
 
+	@misc_utils.log_exception(_moduleLogger)
 	def _cancel_delayed_disconnect(self):
 		_moduleLogger.info("Cancelling auto-log off")
 		self.__delayedDisconnect.cancel()
@@ -230,3 +254,25 @@ class DisconnectOnShutdown(object):
 			self._connRef().disconnect(telepathy.CONNECTION_STATUS_REASON_REQUESTED)
 		except Exception:
 			_moduleLogger.exception("Error durring disconnect")
+
+
+class DelayEnableContactIntegration(object):
+
+	def __init__(self, protocolName):
+		self.__enableSystemContactSupport = telepathy_utils.EnableSystemContactIntegration(
+			protocolName
+		)
+		self.__delayedEnable = gobject_utils.Async(self._on_delayed_enable)
+
+	def start(self):
+		self.__delayedEnable.start()
+
+	def stop(self):
+		self.__delayedEnable.cancel()
+
+	@misc_utils.log_exception(_moduleLogger)
+	def _on_delayed_enable(self):
+		try:
+			self.__enableSystemContactSupport.start()
+		except dbus.DBusException, e:
+			_moduleLogger.info("Contact integration seems to not be supported (%s)" % e)