X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Fpresence.py;h=986abe8067b71c6610ccf543ab805c7881ec4011;hp=ab6fc66655d2a8ca3c5eff2b4becb61d9fe3fb0b;hb=24dc92bc92ad45c5f6db99c6141699506bed0395;hpb=a840b976430685dbf23bee4e590d1ee23594728c diff --git a/src/presence.py b/src/presence.py index ab6fc66..986abe8 100644 --- a/src/presence.py +++ b/src/presence.py @@ -1,11 +1,11 @@ import logging import tp -import gtk_toolbox +import util.misc as misc_utils import simple_presence -_moduleLogger = logging.getLogger('presence') +_moduleLogger = logging.getLogger(__name__) class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPresence): @@ -14,7 +14,7 @@ class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPr 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 = {} @@ -24,16 +24,16 @@ class PresenceMixin(tp.ConnectionInterfacePresence, simple_presence.TheOneRingPr 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]