X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fsimple_presence.py;h=c71a5c249fb65c401c44f2eed81a9250267f2330;hp=5449344eb3732f5bd4ac76979a45b51c2303bc04;hb=8894c48314aa35230635af3f4ae8814234ae3fa1;hpb=424b364f3c325321af6ae352e7f8ad8fcd6df8c2

diff --git a/src/simple_presence.py b/src/simple_presence.py
index 5449344..c71a5c2 100644
--- a/src/simple_presence.py
+++ b/src/simple_presence.py
@@ -1,14 +1,15 @@
 import logging
 
+import dbus
 import telepathy
 
-import gtk_toolbox
+import util.misc as misc_utils
 import tp
 import handle
 import gvoice.state_machine as state_machine
 
 
-_moduleLogger = logging.getLogger("simple_presence")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class TheOneRingPresence(object):
@@ -20,10 +21,10 @@ class TheOneRingPresence(object):
 	OFFLINE = 'offline'
 
 	TO_PRESENCE_TYPE = {
-		ONLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE,
-		AWAY: telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY,
-		HIDDEN: telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN,
-		OFFLINE: telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE,
+		ONLINE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_AVAILABLE),
+		AWAY: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_AWAY),
+		HIDDEN: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_HIDDEN),
+		OFFLINE: dbus.UInt32(telepathy.constants.CONNECTION_PRESENCE_TYPE_OFFLINE),
 	}
 
 	@property
@@ -98,18 +99,21 @@ class SimplePresenceMixin(tp.ConnectionInterfaceSimplePresence, TheOneRingPresen
 			{'Statuses' : self._get_statuses}
 		)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def GetPresences(self, contacts):
 		"""
 		@return {ContactHandle: (Status, Presence Type, Message)}
 		"""
 		personalMessage = u""
-		return dict(
-			(h, (presenceType, presence, personalMessage))
-			for (h, (presenceType, presence)) in self.get_presences(contacts).iteritems()
+		return dbus.Dictionary(
+			(
+				(h, dbus.Struct((presenceType, presence, personalMessage), signature="uss"))
+				for (h, (presenceType, presence)) in self.get_presences(contacts).iteritems()
+			),
+			signature="u(uss)"
 		)
 
-	@gtk_toolbox.log_exception(_moduleLogger)
+	@misc_utils.log_exception(_moduleLogger)
 	def SetPresence(self, status, message):
 		if message:
 			raise telepathy.errors.InvalidArgument("Messages aren't supported")