X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fconnection_manager.py;h=c4b5f219b96befa1fba85dea74b7ec23ba43fbeb;hb=b88c8bef6b10e97db6d75e6fbaba8447092a758e;hp=f16978992abbdbb815a66bf5609e63bdb21732c3;hpb=a1133bfb13b2e4924f0c196d20750832f6058c90;p=theonering

diff --git a/src/connection_manager.py b/src/connection_manager.py
index f169789..c4b5f21 100644
--- a/src/connection_manager.py
+++ b/src/connection_manager.py
@@ -1,9 +1,18 @@
+"""
+Empathy Experience:
+	Can't call
+	When first started, reports all read conversations when some might have been read
+	When first started, reports all of an SMS conversation even though some has been reported previously
+	Still leaking one of two contact lists
+"""
+
 import logging
 
 import gobject
 import telepathy
 
 import constants
+import gtk_toolbox
 import connection
 
 
@@ -20,6 +29,7 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 		self._on_shutdown = shutdown_func
 		_moduleLogger.info("Connection manager created")
 
+	@gtk_toolbox.log_exception(_moduleLogger)
 	def GetParameters(self, proto):
 		"""
 		For org.freedesktop.telepathy.ConnectionManager
@@ -27,7 +37,7 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 		@returns the mandatory and optional parameters for creating a connection
 		"""
 		if proto not in self._protos:
-			raise telepathy.NotImplemented('unknown protocol %s' % proto)
+			raise telepathy.errors.NotImplemented('unknown protocol %s' % proto)
 
 		result = []
 		ConnectionClass = self._protos[proto]
@@ -71,7 +81,7 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 		Overrides telepathy.server.ConnectionManager
 		"""
 		result = telepathy.server.ConnectionManager.disconnected(self, conn)
-		gobject.timeout_add(5000, self.shutdown)
+		gobject.timeout_add(5000, self._shutdown)
 
 	def quit(self):
 		"""
@@ -81,6 +91,7 @@ class TheOneRingConnectionManager(telepathy.server.ConnectionManager):
 			connection.Disconnect()
 		_moduleLogger.info("Connection manager quitting")
 
+	@gtk_toolbox.log_exception(_moduleLogger)
 	def _shutdown(self):
 		if (
 			self._on_shutdown is not None and