X-Git-Url: http://git.maemo.org/git/?p=theonering;a=blobdiff_plain;f=src%2Flocation.py;h=f8ecad50ec7f90c82d5d84510d77b04606ad1953;hp=196525555fea34962fdf35d437dfc2266eb39ce9;hb=472d5669384d85ddc85aff8050fbb6150b47152e;hpb=a6498a3dd1db8b4379713ebda993dd6b3ec86b08

diff --git a/src/location.py b/src/location.py
index 1965255..f8ecad5 100644
--- a/src/location.py
+++ b/src/location.py
@@ -1,30 +1,42 @@
+import logging
+
 import telepathy
 
+import util.misc as misc_utils
+
+
+_moduleLogger = logging.getLogger(__name__)
+
 
-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
-	def gvoice_backend(self):
+	def session(self):
 		"""
 		@abstract
 		"""
-		raise NotImplementedError()
+		raise NotImplementedError("Abstract property called")
 
+	@misc_utils.log_exception(_moduleLogger)
 	def GetLocations(self, contacts):
 		"""
 		@returns {Contact: {Location Type: Location}}
 		"""
-		raise NotImplementedError()
+		raise telepathy.errors.NotImplemented("Yet")
 
+	@misc_utils.log_exception(_moduleLogger)
 	def RequestLocation(self, contact):
 		"""
 		@returns {Location Type: Location}
 		"""
-		raise NotImplementedError()
+		raise telepathy.errors.NotImplemented("Yet")
 
+	@misc_utils.log_exception(_moduleLogger)
 	def SetLocation(self, location):
 		"""
 		Since presence is based off of phone numbers, not allowing the client to change it