X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fpresence.py;h=c73a06140747c6ee053435fe16dcbaec127d72f4;hb=3cc7da422c4cdffb85c6e414c2fb139459d3adf2;hp=8c3825235f997c871dd39be92d2e7d75b80aaa64;hpb=1bd375495719117939fa0ac384835001485eeef7;p=theonering

diff --git a/src/presence.py b/src/presence.py
index 8c38252..c73a061 100644
--- a/src/presence.py
+++ b/src/presence.py
@@ -1,21 +1,20 @@
 import logging
 
-import telepathy
-
-import gtk_toolbox
+import tp
+import util.misc as misc_utils
 import simple_presence
 
 
 _moduleLogger = logging.getLogger('presence')
 
 
-class PresenceMixin(telepathy.server.ConnectionInterfacePresence, simple_presence.TheOneRingPresence):
+class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPresence):
 
 	def __init__(self):
-		telepathy.server.ConnectionInterfacePresence.__init__(self)
+		tp.ConnectionInterfacePresence.__init__(self)
 		simple_presence.TheOneRingPresence.__init__(self)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def GetStatuses(self):
 		# the arguments are in common to all on-line presences
 		arguments = {}
@@ -25,16 +24,16 @@ class PresenceMixin(telepathy.server.ConnectionInterfacePresence, simple_presenc
 			for (localType, telepathyType) in self.TO_PRESENCE_TYPE.iteritems()
 		)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def RequestPresence(self, contactIds):
 		presences = self.__get_presences(contactIds)
 		self.PresenceUpdate(presences)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def GetPresence(self, contactIds):
 		return self.__get_presences(contactIds)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def SetStatus(self, statuses):
 		assert len(statuses) == 1
 		status, arguments = statuses.items()[0]