bump DBus interface name ('version')merge-versions2

1 files changed, 15 insertions, 15 deletions

diff --git a/src/carquinyol/datastore.py b/src/carquinyol/datastore.py
index 8e5c796..4c32941 100644
--- a/src/carquinyol/datastore.py
+++ b/src/carquinyol/datastore.py
@@ -42,7 +42,7 @@ from carquinyol.optimizer import Optimizer
 DS_LOG_CHANNEL = 'org.laptop.sugar.DataStore'
 
 DS_SERVICE = "org.laptop.sugar.DataStore"
-DS_DBUS_INTERFACE = "org.laptop.sugar.DataStore"
+DS_DBUS_INTERFACE2 = "org.laptop.sugar.DataStore2"
 DS_OBJECT_PATH = "/org/laptop/sugar/DataStore"
 
 LOGGER = logging.getLogger(DS_LOG_CHANNEL)
@@ -118,7 +118,7 @@ class DataStore(dbus.service.Object):
         else:
             return True
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='ssa{sv}sb',
              out_signature='ss',
              byte_arrays=True)
@@ -184,12 +184,12 @@ class DataStore(dbus.service.Object):
         self._optimizer.optimize(tree_id, child_id)
         LOGGER.debug("updated %s %s" % (tree_id, child_id))
 
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="sss")
+    @dbus.service.signal(DS_DBUS_INTERFACE2, signature="sss")
     def Saved(self, tree_id, parent_id, child_id):
         # TODO: copy docstring from datastore-redesign.html
         pass
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='ssa{sv}',
              out_signature='',
              byte_arrays=True)
@@ -200,11 +200,11 @@ class DataStore(dbus.service.Object):
         self._index_store.store(tree_id, version_id, metadata)
         self.ChangedMetadata(tree_id, version_id, metadata)
 
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="ssa{sv}")
+    @dbus.service.signal(DS_DBUS_INTERFACE2, signature="ssa{sv}")
     def ChangedMetadata(self, tree_id, version_id, metadata):
         pass
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='a{sv}a{sv}',
              out_signature='aa{sv}u',
              byte_arrays=True)
@@ -212,7 +212,7 @@ class DataStore(dbus.service.Object):
     def find(self, query, options):
         return self._find(query, options)
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='sa{sv}a{sv}',
              out_signature='aa{sv}u',
              byte_arrays=True)
@@ -293,7 +293,7 @@ class DataStore(dbus.service.Object):
 
         return entries, count
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='ss',
              out_signature='s',
              sender_keyword='sender',
@@ -309,7 +309,7 @@ class DataStore(dbus.service.Object):
         self.GotData(sender, tree_id, version_id, path)
         return path
 
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="ssss")
+    @dbus.service.signal(DS_DBUS_INTERFACE2, signature="ssss")
     def GotData(self, sender, tree_id, version_id, path):
         pass
 
@@ -320,7 +320,7 @@ class DataStore(dbus.service.Object):
             return ''
         return mime.get_primary_extension(mime_type)
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
                          in_signature='a{sv}s',
                          out_signature='as')
     def find_unique_values(self, query, metadata_name):
@@ -336,7 +336,7 @@ class DataStore(dbus.service.Object):
             logging.warning('Index updating, returning an empty list')
             return []
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='ss',
              out_signature='',
              byte_arrays=True)
@@ -355,7 +355,7 @@ class DataStore(dbus.service.Object):
         self.Deleted(tree_id, version_id)
         LOGGER.debug("deleted (%r,%r)" % (tree_id, version_id))
 
-    @dbus.service.signal(DS_DBUS_INTERFACE, signature="ss")
+    @dbus.service.signal(DS_DBUS_INTERFACE2, signature="ss")
     def Deleted(self, tree_id, version_id):
         pass
 
@@ -364,17 +364,17 @@ class DataStore(dbus.service.Object):
         self._index_store.close_index()
         self.Stopped()
 
-    @dbus.service.signal(DS_DBUS_INTERFACE)
+    @dbus.service.signal(DS_DBUS_INTERFACE2)
     def Stopped(self):
         pass
 
-    @dbus.service.method(DS_DBUS_INTERFACE,
+    @dbus.service.method(DS_DBUS_INTERFACE2,
              in_signature='',
              out_signature='b')
     def check_ready(self):
         return layoutmanager.get_instance().index_updated
 
-    @dbus.service.signal(DS_DBUS_INTERFACE)
+    @dbus.service.signal(DS_DBUS_INTERFACE2)
     def Ready(self):
         pass