X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fpresence.py;h=add58927c446d3f3ff851541eeb443d8ba7080ed;hp=c73a06140747c6ee053435fe16dcbaec127d72f4;hb=5b7c9614e01a6d01df71e595c08bc607c31f5048;hpb=1c892d1b9bf14b28eb54ce3590ed2ee29d5e3d25

diff --git a/src/presence.py b/src/presence.py
index c73a061..add5892 100644
--- a/src/presence.py
+++ b/src/presence.py
@@ -2,17 +2,16 @@ import logging
 
 import tp
 import util.misc as misc_utils
-import simple_presence
 
 
-_moduleLogger = logging.getLogger('presence')
+_moduleLogger = logging.getLogger(__name__)
 
 
-class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPresence):
+class PresenceMixin(tp.ConnectionInterfacePresence):
 
-	def __init__(self):
+	def __init__(self, torPresence):
 		tp.ConnectionInterfacePresence.__init__(self)
-		simple_presence.TheOneRingPresence.__init__(self)
+		self.__torPresence = torPresence
 
 	@misc_utils.log_exception(_moduleLogger)
 	def GetStatuses(self):
@@ -21,7 +20,7 @@ class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPr
 
 		return dict(
 			(localType, (telepathyType, True, True, arguments))
-			for (localType, telepathyType) in self.TO_PRESENCE_TYPE.iteritems()
+			for (localType, telepathyType) in self.__torPresence.TO_PRESENCE_TYPE.iteritems()
 		)
 
 	@misc_utils.log_exception(_moduleLogger)
@@ -38,11 +37,11 @@ class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPr
 		assert len(statuses) == 1
 		status, arguments = statuses.items()[0]
 		assert len(arguments) == 0
-		self.set_presence(status)
+		self.__torPresence.set_presence(status)
 
 	def __get_presences(self, contacts):
 		arguments = {}
 		return dict(
 			(h, (0, {presence: arguments}))
-			for (h, (presenceType, presence)) in self.get_presences(contacts).iteritems()
+			for (h, (presenceType, presence)) in self.__torPresence.get_presences(contacts).iteritems()
 		)