X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsimple_presence.py;h=5449344eb3732f5bd4ac76979a45b51c2303bc04;hb=b58a60f57eb97bfc4fb3008b3edb4618d60ad045;hp=f7e0160a109e868eca51eb16ec4beb5b0fb377d6;hpb=d79844a2cc2eebb20f460a094eb605f9b1c6241c;p=theonering

diff --git a/src/simple_presence.py b/src/simple_presence.py
index f7e0160..5449344 100644
--- a/src/simple_presence.py
+++ b/src/simple_presence.py
@@ -47,15 +47,13 @@ class TheOneRingPresence(object):
 
 	def get_presences(self, contactIds):
 		"""
-		@bug On Maemo 5, the connection handle is being passed in a lot, forcing lots of downloads is the webpage for dnd
-
 		@return {ContactHandle: (Status, Presence Type, Message)}
 		"""
 		presences = {}
 		for handleId in contactIds:
 			h = self.get_handle_by_id(telepathy.HANDLE_TYPE_CONTACT, handleId)
 			if isinstance(h, handle.ConnectionHandle):
-				isDnd = self.session.backend.is_dnd()
+				isDnd = self.session.is_dnd()
 				if isDnd:
 					presence = TheOneRingPresence.HIDDEN
 				else:
@@ -68,7 +66,7 @@ class TheOneRingPresence(object):
 						raise telepathy.errors.InvalidArgument("Unsupported state on the state machine: %s" % state)
 				presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
 			else:
-				presence = TheOneRingPresence.ONLINE
+				presence = TheOneRingPresence.AWAY
 				presenceType = TheOneRingPresence.TO_PRESENCE_TYPE[presence]
 
 			presences[h] = (presenceType, presence)
@@ -76,12 +74,12 @@ class TheOneRingPresence(object):
 
 	def set_presence(self, status):
 		if status == self.ONLINE:
-			self.session.backend.set_dnd(False)
+			self.session.set_dnd(False)
 			self.session.stateMachine.set_state(state_machine.StateMachine.STATE_ACTIVE)
 		elif status == self.AWAY:
 			self.session.stateMachine.set_state(state_machine.StateMachine.STATE_IDLE)
 		elif status == self.HIDDEN:
-			self.session.backend.set_dnd(True)
+			self.session.set_dnd(True)
 		elif status == self.OFFLINE:
 			self.Disconnect()
 		else: