Updating whats displayed for get_state_status

[theonering] / src / location.py

diff --git a/src/location.py b/src/location.py
index 4151b9c..a77d0c7 100644 (file)
--- a/src/location.py
+++ b/src/location.py
@@ -2,17 +2,17 @@ import logging
 
 import telepathy
 
-import gtk_toolbox
+import util.misc as misc_utils
 
 
 _moduleLogger = logging.getLogger('location')
 
 
-#class LocationMixin(telepathy.server.ConnectionInterfaceLocation):
+#class LocationMixin(tp.ConnectionInterfaceLocation):
 class LocationMixin(object):
 
        def __init__(self):
-               #telepathy.server.ConnectionInterfaceLocation.__init__(self)
+               #tp.ConnectionInterfaceLocation.__init__(self)
                pass
 
        @property
@@ -22,21 +22,21 @@ class LocationMixin(object):
                """
                raise NotImplementedError("Abstract property called")
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def GetLocations(self, contacts):
                """
                @returns {Contact: {Location Type: Location}}
                """
-               raise telepathy.NotImplemented("Yet")
+               raise telepathy.errors.NotImplemented("Yet")
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def RequestLocation(self, contact):
                """
                @returns {Location Type: Location}
                """
-               raise telepathy.NotImplemented("Yet")
+               raise telepathy.errors.NotImplemented("Yet")
 
-       @gtk_toolbox.log_exception(_moduleLogger)
+       @misc_utils.log_exception(_moduleLogger)
        def SetLocation(self, location):
                """
                Since presence is based off of phone numbers, not allowing the client to change it