GNOME.org
 

[tracker] Versioning the DBus API

commit a36fa0c15c3dcc2cef5066841464baeb0b5fc86f
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Aug 5 15:23:48 2009 +0200

    Versioning the DBus API
    
    This patch changes Tracker. into Tracker1. , Tracker/ into Tracker1/ and
    the Tracker ending of the DBus service name into Tracker1 in all DBus API
    
    It follows the guidlines outlined by Lennart here:
    http://0pointer.de/blog/projects/versioning-dbus.html

 .../org.freedesktop.Tracker.Extract.service.in     |    2 +-
 .../org.freedesktop.Tracker.Miner.FS.service.in    |    2 +-
 data/dbus/tracker-backup.xml                       |    2 +-
 data/dbus/tracker-extract.xml                      |    6 ++--
 data/dbus/tracker-miner.xml                        |    2 +-
 data/dbus/tracker-resources-class.xml              |    2 +-
 data/dbus/tracker-resources.xml                    |    4 +-
 data/dbus/tracker-statistics.xml                   |    2 +-
 python/deskbar-handler/tracker-handler.py          |   10 +++---
 python/deskbar-handler/tracker-module.py           |   16 +++++-----
 src/libtracker/tracker.c                           |   32 ++++++++++----------
 ...-freedesktop-Tracker-evolution-plugin.eplug.xml |    2 +-
 src/plugins/evolution/tracker-evolution-common.h   |    6 ++--
 src/plugins/kmail/tracker-kmail-common.h           |    6 ++--
 src/tracker-explorer/explorer.vala                 |    8 ++--
 src/tracker-extract/tracker-dbus.c                 |    4 +-
 src/tracker-extract/tracker-extract.h              |    6 ++--
 src/tracker-miner-fs/tracker-dbus.c                |    2 +-
 src/tracker-miner-fs/tracker-indexer.h             |    8 ++--
 src/tracker-miner-fs/tracker-main.c                |    6 ++--
 src/tracker-miner-fs/tracker-miner.h               |    6 ++--
 .../tracker-module-metadata-utils.c                |   12 ++++----
 src/tracker-store/tracker-backup.h                 |    6 ++--
 src/tracker-store/tracker-dbus.c                   |    6 ++--
 src/tracker-store/tracker-resource-class.h         |    6 ++--
 src/tracker-store/tracker-resources.h              |    6 ++--
 src/tracker-store/tracker-statistics.h             |    6 ++--
 27 files changed, 88 insertions(+), 88 deletions(-)
---
diff --git a/data/dbus/org.freedesktop.Tracker.Extract.service.in b/data/dbus/org.freedesktop.Tracker.Extract.service.in
index 64a616f..a9e906f 100644
--- a/data/dbus/org.freedesktop.Tracker.Extract.service.in
+++ b/data/dbus/org.freedesktop.Tracker.Extract.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Tracker.Extract
+Name=org.freedesktop.Tracker1.Extract
 Exec= libexecdir@/tracker-extract
diff --git a/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in b/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
index 4236f97..0d70513 100644
--- a/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
+++ b/data/dbus/org.freedesktop.Tracker.Miner.FS.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Tracker.Indexer
+Name=org.freedesktop.Tracker1.Indexer
 Exec= libexecdir@/tracker-miner-fs
diff --git a/data/dbus/tracker-backup.xml b/data/dbus/tracker-backup.xml
index 8e1274b..7ba81d2 100644
--- a/data/dbus/tracker-backup.xml
+++ b/data/dbus/tracker-backup.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <node name="/">
-  <interface name="org.freedesktop.Tracker.Backup">
+  <interface name="org.freedesktop.Tracker1.Backup">
     <method name="Save">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="turtle-file-uri" direction="in" />
diff --git a/data/dbus/tracker-extract.xml b/data/dbus/tracker-extract.xml
index 51e31b5..0301008 100644
--- a/data/dbus/tracker-extract.xml
+++ b/data/dbus/tracker-extract.xml
@@ -3,14 +3,14 @@
 <!--
 <busconfig>
     <policy context="default">
-      <deny send_interface="org.freedesktop.Tracker.Indexer"/>
-      <allow send_destination="org.freedesktop.Tracker"/>
+      <deny send_interface="org.freedesktop.Tracker1.Indexer"/>
+      <allow send_destination="org.freedesktop.Tracker1"/>
     </policy>
 </busconfig>
 -->
 
 <node name="/">
-  <interface name="org.freedesktop.Tracker.Extract">  
+  <interface name="org.freedesktop.Tracker1.Extract">  
     <method name="GetPid">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="i" name="value" direction="out" />
diff --git a/data/dbus/tracker-miner.xml b/data/dbus/tracker-miner.xml
index a44183d..07e4d49 100644
--- a/data/dbus/tracker-miner.xml
+++ b/data/dbus/tracker-miner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <node name="/">
-  <interface name="org.freedesktop.Tracker.Miner.FS">
+  <interface name="org.freedesktop.Tracker1.Miner.FS">
     <method name="Pause">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
     </method>
diff --git a/data/dbus/tracker-resources-class.xml b/data/dbus/tracker-resources-class.xml
index 665c9ed..9212e43 100644
--- a/data/dbus/tracker-resources-class.xml
+++ b/data/dbus/tracker-resources-class.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <node name="/">
-  <interface name="org.freedesktop.Tracker.Resources.Class"> 
+  <interface name="org.freedesktop.Tracker1.Resources.Class"> 
 
     <!-- Signal for changed subjects -->
 
diff --git a/data/dbus/tracker-resources.xml b/data/dbus/tracker-resources.xml
index a5ffece..9a2d59a 100644
--- a/data/dbus/tracker-resources.xml
+++ b/data/dbus/tracker-resources.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<node name="/org/freedesktop/Tracker">
-  <interface name="org.freedesktop.Tracker.Resources">
+<node name="/org/freedesktop/Tracker1">
+  <interface name="org.freedesktop.Tracker1.Resources">
 
     <!-- Insert single statement -->
     <method name="Insert">
diff --git a/data/dbus/tracker-statistics.xml b/data/dbus/tracker-statistics.xml
index 30f9df8..0303dd4 100644
--- a/data/dbus/tracker-statistics.xml
+++ b/data/dbus/tracker-statistics.xml
@@ -17,7 +17,7 @@
   -->
 
 <node name="/">
-  <interface name="org.freedesktop.Tracker.Statistics">
+  <interface name="org.freedesktop.Tracker1.Statistics">
    
     <!-- Get statistics for services that have been indexed. Output is
 	 in string array format: [service, no of entities]  
diff --git a/python/deskbar-handler/tracker-handler.py b/python/deskbar-handler/tracker-handler.py
index f10678c..aac5880 100644
--- a/python/deskbar-handler/tracker-handler.py
+++ b/python/deskbar-handler/tracker-handler.py
@@ -306,10 +306,10 @@ class TrackerLiveSearchHandler(deskbar.Handler.SignallingHandler):
 				print "Connecting to Tracker (first search or tracker-store restarted)"
 				import dbus
 				bus = dbus.SessionBus()
-				self.tracker = bus.get_object('org.freedesktop.Tracker','/org/freedesktop/tracker')
-				self.search_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker.Search')
-				self.keywords_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker.Keywords')
-				self.files_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker.Files')
+				self.tracker = bus.get_object('org.freedesktop.Tracker1','/org/freedesktop/Tracker1')
+				self.search_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker1.Search')
+				self.keywords_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker1.Keywords')
+				self.files_iface = dbus.Interface(self.tracker, 'org.freedesktop.Tracker1.Files')
 			except:
 				print >> sys.stderr, '*** DBus connection to tracker failed, check your settings.'
 				return
@@ -332,7 +332,7 @@ class TrackerLiveSearchHandler(deskbar.Handler.SignallingHandler):
 				proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
 				dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
 				activatables = dbus_iface.ListActivatableNames()
-				if not 'org.freedesktop.Tracker' in activatables:
+				if not 'org.freedesktop.Tracker1' in activatables:
 					return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, 'Tracker is not activatable via dbus', None)
 			except:
 				return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, 'Python dbus.glib bindings not found.', None)
diff --git a/python/deskbar-handler/tracker-module.py b/python/deskbar-handler/tracker-module.py
index 772f2ec..330ff20 100644
--- a/python/deskbar-handler/tracker-module.py
+++ b/python/deskbar-handler/tracker-module.py
@@ -319,7 +319,7 @@ class TrackerLiveSearchHandler(deskbar.interfaces.Module):
 				proxy_obj = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
 				dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.DBus')
 				activatables = dbus_iface.ListActivatableNames()
-				if not 'org.freedesktop.Tracker' in activatables:
+				if not 'org.freedesktop.Tracker1' in activatables:
 					TrackerLiveSearchHandler.INSTRUCTIONS = ('Tracker is not activatable via dbus')
 					return False
 			except:
@@ -447,13 +447,13 @@ class TrackerLiveSearchHandler(deskbar.interfaces.Module):
 				print "Connecting to Tracker (first search or tracker-store restarted)"
 				import dbus
 				bus = dbus.SessionBus()
-				self.tracker = bus.get_object('org.freedesktop.Tracker', '/org/freedesktop/Tracker')
-				self.tracker_search = bus.get_object('org.freedesktop.Tracker', '/org/freedesktop/Tracker/Search')
-				self.search_iface = dbus.Interface(self.tracker_search, 'org.freedesktop.Tracker.Search')
-				self.tracker_keywords = bus.get_object('org.freedesktop.Tracker', '/org/freedesktop/Tracker/Keywords')
-				self.keywords_iface = dbus.Interface(self.tracker_keywords, 'org.freedesktop.Tracker.Keywords')
-				self.tracker_files = bus.get_object('org.freedesktop.Tracker', '/org/freedesktop/Tracker/Files')
-				self.files_iface = dbus.Interface(self.tracker_files, 'org.freedesktop.Tracker.Files')
+				self.tracker = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1')
+				self.tracker_search = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Search')
+				self.search_iface = dbus.Interface(self.tracker_search, 'org.freedesktop.Tracker1.Search')
+				self.tracker_keywords = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Keywords')
+				self.keywords_iface = dbus.Interface(self.tracker_keywords, 'org.freedesktop.Tracker1.Keywords')
+				self.tracker_files = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Files')
+				self.files_iface = dbus.Interface(self.tracker_files, 'org.freedesktop.Tracker1.Files')
 			except:
 				print >> sys.stderr, 'DBus connection to tracker failed, check your settings.'
 				return
diff --git a/src/libtracker/tracker.c b/src/libtracker/tracker.c
index aaa63d5..d4b4f58 100644
--- a/src/libtracker/tracker.c
+++ b/src/libtracker/tracker.c
@@ -26,10 +26,10 @@
 #include "tracker-resources-glue.h"
 #include "tracker-statistics-glue.h"
 
-#define TRACKER_SERVICE			"org.freedesktop.Tracker"
-#define TRACKER_OBJECT			"/org/freedesktop/Tracker"
-#define TRACKER_INTERFACE_RESOURCES	"org.freedesktop.Tracker.Resources"
-#define TRACKER_INTERFACE_STATISTICS	"org.freedesktop.Tracker.Statistics"
+#define TRACKER_SERVICE			"org.freedesktop.Tracker1"
+#define TRACKER_OBJECT			"/org/freedesktop/Tracker1"
+#define TRACKER_INTERFACE_RESOURCES	"org.freedesktop.Tracker1.Resources"
+#define TRACKER_INTERFACE_STATISTICS	"org.freedesktop.Tracker1.Statistics"
 
 typedef struct {
 	TrackerReplyGPtrArray callback;
@@ -197,7 +197,7 @@ tracker_statistics_get (TrackerClient  *client,
 {
 	GPtrArray *table;
 
-	if (!org_freedesktop_Tracker_Statistics_get (client->proxy_statistics, 
+	if (!org_freedesktop_Tracker1_Statistics_get (client->proxy_statistics, 
                                                      &table, 
                                                      &*error)) {
 		return NULL;
@@ -211,7 +211,7 @@ tracker_resources_load (TrackerClient  *client,
                         const gchar    *uri, 
                         GError        **error)
 {
-	org_freedesktop_Tracker_Resources_load (client->proxy_resources, 
+	org_freedesktop_Tracker1_Resources_load (client->proxy_resources, 
                                                 uri, 
                                                 &*error);
 }
@@ -223,7 +223,7 @@ tracker_resources_sparql_query (TrackerClient  *client,
 {
 	GPtrArray *table;
 
-	if (!org_freedesktop_Tracker_Resources_sparql_query (client->proxy_resources, 
+	if (!org_freedesktop_Tracker1_Resources_sparql_query (client->proxy_resources, 
                                                              query, 
                                                              &table, 
                                                              &*error)) {
@@ -238,7 +238,7 @@ tracker_resources_sparql_update (TrackerClient  *client,
                                  const gchar    *query, 
                                  GError        **error)
 {
-	org_freedesktop_Tracker_Resources_sparql_update (client->proxy_resources, 
+	org_freedesktop_Tracker1_Resources_sparql_update (client->proxy_resources, 
                                                          query, 
                                                          &*error);
 }
@@ -248,7 +248,7 @@ tracker_resources_batch_sparql_update (TrackerClient  *client,
                                        const gchar    *query, 
                                        GError        **error)
 {
-	org_freedesktop_Tracker_Resources_batch_sparql_update (client->proxy_resources, 
+	org_freedesktop_Tracker1_Resources_batch_sparql_update (client->proxy_resources, 
                                                                query, 
                                                                &*error);
 }
@@ -257,7 +257,7 @@ void
 tracker_resources_batch_commit (TrackerClient  *client, 
                                 GError        **error)
 {
-	org_freedesktop_Tracker_Resources_batch_commit (client->proxy_resources,
+	org_freedesktop_Tracker1_Resources_batch_commit (client->proxy_resources,
                                                         &*error);
 }
 
@@ -274,7 +274,7 @@ tracker_statistics_get_async (TrackerClient         *client,
 
         client->pending_proxy = client->proxy_statistics;
 	client->pending_call = 
-                org_freedesktop_Tracker_Statistics_get_async (client->proxy_statistics, 
+                org_freedesktop_Tracker1_Statistics_get_async (client->proxy_statistics, 
                                                               tracker_GPtrArray_reply, 
                                                               s);
 }
@@ -293,7 +293,7 @@ tracker_resources_load_async (TrackerClient     *client,
 
         client->pending_proxy = client->proxy_resources;
 	client->pending_call = 
-                org_freedesktop_Tracker_Resources_load_async (client->proxy_resources, 
+                org_freedesktop_Tracker1_Resources_load_async (client->proxy_resources, 
                                                               uri, 
                                                               tracker_void_reply, 
                                                               s);
@@ -313,7 +313,7 @@ tracker_resources_sparql_query_async (TrackerClient         *client,
 
         client->pending_proxy = client->proxy_resources;
 	client->pending_call = 
-                org_freedesktop_Tracker_Resources_sparql_query_async (client->proxy_resources, 
+                org_freedesktop_Tracker1_Resources_sparql_query_async (client->proxy_resources, 
                                                                       query, 
                                                                       tracker_GPtrArray_reply, 
                                                                       s);
@@ -333,7 +333,7 @@ tracker_resources_sparql_update_async (TrackerClient    *client,
 
         client->pending_proxy = client->proxy_resources;
 	client->pending_call = 
-                org_freedesktop_Tracker_Resources_sparql_update_async (client->proxy_resources, 
+                org_freedesktop_Tracker1_Resources_sparql_update_async (client->proxy_resources, 
                                                                        query, 
                                                                        tracker_void_reply, 
                                                                        s);
@@ -353,7 +353,7 @@ tracker_resources_batch_sparql_update_async (TrackerClient    *client,
 
         client->pending_proxy = client->proxy_resources;
 	client->pending_call = 
-                org_freedesktop_Tracker_Resources_batch_sparql_update_async (client->proxy_resources, 
+                org_freedesktop_Tracker1_Resources_batch_sparql_update_async (client->proxy_resources, 
                                                                              query, 
                                                                              tracker_void_reply, 
                                                                              s);
@@ -372,7 +372,7 @@ tracker_resources_batch_commit_async (TrackerClient    *client,
 
         client->pending_proxy = client->proxy_resources;
 	client->pending_call = 
-                org_freedesktop_Tracker_Resources_batch_commit_async (client->proxy_resources, 
+                org_freedesktop_Tracker1_Resources_batch_commit_async (client->proxy_resources, 
                                                                       tracker_void_reply, 
                                                                       s);
 }
diff --git a/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml b/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
index be4fb2a..3bf963d 100644
--- a/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
+++ b/src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <e-plugin-list>
-	<e-plugin id="org.freedesktop.Tracker.evolution_plugin" 
+	<e-plugin id="org.freedesktop.Tracker1.evolution_plugin" 
 		type="shlib"
 		location="+PLUGIN_INSTALL_DIR+/liborg-freedesktop-Tracker-evolution-plugin.so"
 		domain="+GETTEXT_PACKAGE+"
diff --git a/src/plugins/evolution/tracker-evolution-common.h b/src/plugins/evolution/tracker-evolution-common.h
index c37e787..ecdb806 100644
--- a/src/plugins/evolution/tracker-evolution-common.h
+++ b/src/plugins/evolution/tracker-evolution-common.h
@@ -26,10 +26,10 @@
 
 /* Latest spec location: http://live.gnome.org/Evolution/Metadata */
 
-#define TRACKER_EVOLUTION_INDEXER_PATH		"/org/freedesktop/Tracker/Indexer/Evolution/Registrar"
+#define TRACKER_EVOLUTION_INDEXER_PATH		"/org/freedesktop/Tracker1/Indexer/Evolution/Registrar"
 
-#define TRACKER_EVOLUTION_REGISTRAR_SERVICE	"org.freedesktop.Tracker"
-#define TRACKER_EVOLUTION_REGISTRAR_PATH	"/org/freedesktop/Tracker/Evolution/Registrar"
+#define TRACKER_EVOLUTION_REGISTRAR_SERVICE	"org.freedesktop.Tracker1"
+#define TRACKER_EVOLUTION_REGISTRAR_PATH	"/org/freedesktop/Tracker1/Evolution/Registrar"
 #define TRACKER_EVOLUTION_REGISTRAR_INTERFACE	"org.freedesktop.email.metadata.Registrar"
 
 #define TRACKER_EVOLUTION_MANAGER_SERVICE	"org.gnome.evolution"
diff --git a/src/plugins/kmail/tracker-kmail-common.h b/src/plugins/kmail/tracker-kmail-common.h
index b9c4e33..3c1e457 100644
--- a/src/plugins/kmail/tracker-kmail-common.h
+++ b/src/plugins/kmail/tracker-kmail-common.h
@@ -26,10 +26,10 @@
 
 /* Latest spec location: http://live.kde.org/Evolution/Metadata */
 
-#define TRACKER_KMAIL_INDEXER_PATH		"/org/freedesktop/Tracker/Indexer/KMail/Registrar"
+#define TRACKER_KMAIL_INDEXER_PATH		"/org/freedesktop/Tracker1/Indexer/KMail/Registrar"
 
-#define TRACKER_KMAIL_REGISTRAR_SERVICE		"org.freedesktop.Tracker"
-#define TRACKER_KMAIL_REGISTRAR_PATH		"/org/freedesktop/Tracker/KMail/Registrar"
+#define TRACKER_KMAIL_REGISTRAR_SERVICE		"org.freedesktop.Tracker1"
+#define TRACKER_KMAIL_REGISTRAR_PATH		"/org/freedesktop/Tracker1/KMail/Registrar"
 #define TRACKER_KMAIL_REGISTRAR_INTERFACE	"org.freedesktop.email.metadata.Registrar"
 
 #define TRACKER_KMAIL_MANAGER_SERVICE		"org.kde.kmail"
diff --git a/src/tracker-explorer/explorer.vala b/src/tracker-explorer/explorer.vala
index d7514f6..e131fb1 100644
--- a/src/tracker-explorer/explorer.vala
+++ b/src/tracker-explorer/explorer.vala
@@ -6,7 +6,7 @@ extern static const string UIDIR;
 [CCode (cname = "SRCDIR")]
 extern static const string SRCDIR;
 
-[DBus (name = "org.freedesktop.Tracker.Resources")]
+[DBus (name = "org.freedesktop.Tracker1.Resources")]
 interface Resources : GLib.Object {
 	public abstract void Delete (string subject, string predicate, string object_) throws DBus.Error;
 	public abstract void Insert (string subject, string predicate, string object_) throws DBus.Error;
@@ -93,9 +93,9 @@ public class Explorer {
 
 		try {
 			var conn = DBus.Bus.get (DBus.BusType.SESSION);
-			tracker = (Resources) conn.get_object ("org.freedesktop.Tracker",
-							       "/org/freedesktop/Tracker/Resources",
-							       "org.freedesktop.Tracker.Resources");
+			tracker = (Resources) conn.get_object ("org.freedesktop.Tracker1",
+							       "/org/freedesktop/Tracker1/Resources",
+							       "org.freedesktop.Tracker1.Resources");
 		} catch (DBus.Error e) {
 			var msg = new MessageDialog (null, DialogFlags.MODAL,
 					 MessageType.ERROR, ButtonsType.CANCEL,
diff --git a/src/tracker-extract/tracker-dbus.c b/src/tracker-extract/tracker-dbus.c
index d895663..8785f3a 100644
--- a/src/tracker-extract/tracker-dbus.c
+++ b/src/tracker-extract/tracker-dbus.c
@@ -111,7 +111,7 @@ dbus_register_names (void)
 					    DBUS_PATH_DBUS,
 					    DBUS_INTERFACE_DBUS);
 
-	/* Register the service name for org.freedesktop.Tracker.Extract */
+	/* Register the service name for org.freedesktop.Tracker1.Extract */
 	if (!dbus_register_service (gproxy, TRACKER_EXTRACT_SERVICE)) {
 		return FALSE;
 	}
@@ -162,7 +162,7 @@ tracker_dbus_register_objects (void)
 		return FALSE;
 	}
 
-	/* Add org.freedesktop.Tracker.Extract */
+	/* Add org.freedesktop.Tracker1.Extract */
 	object = tracker_extract_new ();
 	if (!object) {
 		g_critical ("Could not create TrackerExtract object to register");
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 769b26a..a18e07d 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -25,9 +25,9 @@
 
 #include <dbus/dbus-glib-bindings.h>
 
-#define TRACKER_EXTRACT_SERVICE	       "org.freedesktop.Tracker.Extract"
-#define TRACKER_EXTRACT_PATH	       "/org/freedesktop/Tracker/Extract"
-#define TRACKER_EXTRACT_INTERFACE      "org.freedesktop.Tracker.Extract"
+#define TRACKER_EXTRACT_SERVICE	       "org.freedesktop.Tracker1.Extract"
+#define TRACKER_EXTRACT_PATH	       "/org/freedesktop/Tracker1/Extract"
+#define TRACKER_EXTRACT_INTERFACE      "org.freedesktop.Tracker1.Extract"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-miner-fs/tracker-dbus.c b/src/tracker-miner-fs/tracker-dbus.c
index 38f390b..93753b2 100644
--- a/src/tracker-miner-fs/tracker-dbus.c
+++ b/src/tracker-miner-fs/tracker-dbus.c
@@ -146,7 +146,7 @@ dbus_register_names (void)
 					    DBUS_INTERFACE_DBUS);
 
 	/* Register the service name for org.freedesktop.Tracker */
-	if (!dbus_register_service (gproxy, "org.freedesktop.Tracker.Miner.FS")) {
+	if (!dbus_register_service (gproxy, "org.freedesktop.Tracker1.Miner.FS")) {
 		return FALSE;
 	}
 
diff --git a/src/tracker-miner-fs/tracker-indexer.h b/src/tracker-miner-fs/tracker-indexer.h
index 75fa60b..6353c34 100644
--- a/src/tracker-miner-fs/tracker-indexer.h
+++ b/src/tracker-miner-fs/tracker-indexer.h
@@ -30,10 +30,10 @@
 
 #include "tracker-config.h"
 
-#define TRACKER_DAEMON_SERVICE	     "org.freedesktop.Tracker"
-#define TRACKER_INDEXER_SERVICE      "org.freedesktop.Tracker.Indexer"
-#define TRACKER_INDEXER_PATH	     "/org/freedesktop/Tracker/Indexer"
-#define TRACKER_INDEXER_INTERFACE    "org.freedesktop.Tracker.Indexer"
+#define TRACKER_DAEMON_SERVICE	     "org.freedesktop.Tracker1"
+#define TRACKER_INDEXER_SERVICE      "org.freedesktop.Tracker1.Indexer"
+#define TRACKER_INDEXER_PATH	     "/org/freedesktop/Tracker1/Indexer"
+#define TRACKER_INDEXER_INTERFACE    "org.freedesktop.Tracker1.Indexer"
 
 /* Transaction every 'x' items */
 #define TRACKER_INDEXER_TRANSACTION_MAX	4000
diff --git a/src/tracker-miner-fs/tracker-main.c b/src/tracker-miner-fs/tracker-main.c
index db8eb11..8b48577 100644
--- a/src/tracker-miner-fs/tracker-main.c
+++ b/src/tracker-miner-fs/tracker-main.c
@@ -260,9 +260,9 @@ albumart_init (TrackerConfig *config)
 	/* Get proxy for Service / Path / Interface of the indexer */
 	proxy_for_extractor = 
                 dbus_g_proxy_new_for_name (connection,
-                                           "org.freedesktop.Tracker.Extract",
-                                           "/org/freedesktop/Tracker/Extract",
-                                           "org.freedesktop.Tracker.Extract");
+                                           "org.freedesktop.Tracker1.Extract",
+                                           "/org/freedesktop/Tracker1/Extract",
+                                           "org.freedesktop.Tracker1.Extract");
 
 	if (!proxy_for_extractor) {
 		g_critical ("Could not create a DBusGProxy to the extract service");
diff --git a/src/tracker-miner-fs/tracker-miner.h b/src/tracker-miner-fs/tracker-miner.h
index 7b044e4..a5a71a2 100644
--- a/src/tracker-miner-fs/tracker-miner.h
+++ b/src/tracker-miner-fs/tracker-miner.h
@@ -26,9 +26,9 @@
 
 #include "tracker-indexer.h"
 
-#define TRACKER_MINER_SERVICE      "org.freedesktop.Tracker.Miner.FS"
-#define TRACKER_MINER_PATH         "/org/freedesktop/Tracker/Miner/FS"
-#define TRACKER_MINER_INTERFACE    "org.freedesktop.Tracker.Miner.FS"
+#define TRACKER_MINER_SERVICE      "org.freedesktop.Tracker1.Miner.FS"
+#define TRACKER_MINER_PATH         "/org/freedesktop/Tracker1/Miner/FS"
+#define TRACKER_MINER_INTERFACE    "org.freedesktop.Tracker1.Miner.FS"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-miner-fs/tracker-module-metadata-utils.c b/src/tracker-miner-fs/tracker-module-metadata-utils.c
index 34e1960..9a54283 100644
--- a/src/tracker-miner-fs/tracker-module-metadata-utils.c
+++ b/src/tracker-miner-fs/tracker-module-metadata-utils.c
@@ -93,7 +93,7 @@ get_extractor_pid (void)
 	GPid pid;
 
 	/* Get new PID from extractor */
-	if (!org_freedesktop_Tracker_Extract_get_pid (get_dbus_extract_proxy (),
+	if (!org_freedesktop_Tracker1_Extract_get_pid (get_dbus_extract_proxy (),
 						      &pid,
 						      &error)) {
 		g_critical ("Couldn't get PID from tracker-extract, %s",
@@ -143,15 +143,15 @@ get_dbus_extract_proxy (void)
 
 	/* Get proxy for Service / Path / Interface of the indexer */
 	proxy = dbus_g_proxy_new_for_name (connection,
-					   "org.freedesktop.Tracker.Extract",
-					   "/org/freedesktop/Tracker/Extract",
-					   "org.freedesktop.Tracker.Extract");
+					   "org.freedesktop.Tracker1.Extract",
+					   "/org/freedesktop/Tracker1/Extract",
+					   "org.freedesktop.Tracker1.Extract");
 
 	if (!proxy) {
 		g_critical ("Could not create a DBusGProxy to the extract service");
 	}
 
-	tracker_dbus_add_name_monitor ("org.freedesktop.Tracker.Extract",
+	tracker_dbus_add_name_monitor ("org.freedesktop.Tracker1.Extract",
 				       extractor_changed_availability_cb,
 				       NULL, NULL);
 	return proxy;
@@ -379,7 +379,7 @@ metadata_utils_get_embedded (GFile		 *file,
 	g_object_set_data (G_OBJECT (file), "extractor-context", context);
 	uri = g_file_get_uri (file);
 
-	org_freedesktop_Tracker_Extract_get_metadata_async (get_dbus_extract_proxy (),
+	org_freedesktop_Tracker1_Extract_get_metadata_async (get_dbus_extract_proxy (),
 							    uri,
 							    mime_type,
 							    get_metadata_async_cb,
diff --git a/src/tracker-store/tracker-backup.h b/src/tracker-store/tracker-backup.h
index 32a63f2..0b663b0 100644
--- a/src/tracker-store/tracker-backup.h
+++ b/src/tracker-store/tracker-backup.h
@@ -24,9 +24,9 @@
 
 #include <glib-object.h>
 
-#define TRACKER_BACKUP_SERVICE	       "org.freedesktop.Tracker"
-#define TRACKER_BACKUP_PATH	       "/org/freedesktop/Tracker/Backup"
-#define TRACKER_BACKUP_INTERFACE       "org.freedesktop.Tracker.Backup"
+#define TRACKER_BACKUP_SERVICE	       "org.freedesktop.Tracker1"
+#define TRACKER_BACKUP_PATH	       "/org/freedesktop/Tracker1/Backup"
+#define TRACKER_BACKUP_INTERFACE       "org.freedesktop.Tracker1.Backup"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index ee019c7..61966c3 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -196,7 +196,7 @@ tracker_dbus_register_objects (void)
 			      TRACKER_STATISTICS_PATH);
 	objects = g_slist_prepend (objects, object);
 
-	/* Add org.freedesktop.Tracker.Resources */
+	/* Add org.freedesktop.Tracker1.Resources */
 	object = resources = tracker_resources_new ();
 	if (!object) {
 		g_critical ("Could not create TrackerResources object to register");
@@ -210,7 +210,7 @@ tracker_dbus_register_objects (void)
 			      TRACKER_RESOURCES_PATH);
 	objects = g_slist_prepend (objects, object);
 
-	/* Add org.freedesktop.Tracker.Backup */
+	/* Add org.freedesktop.Tracker1.Backup */
 	object = tracker_backup_new ();
 	if (!object) {
 		g_critical ("Could not create TrackerBackup object to register");
@@ -283,7 +283,7 @@ tracker_dbus_register_objects (void)
 					replaced);
 		g_free (replaced);
 		
-		/* Add a org.freedesktop.Tracker.Resources.Class */
+		/* Add a org.freedesktop.Tracker1.Resources.Class */
 		object = tracker_resource_class_new (rdf_class);
 		if (!object) {
 			g_critical ("Could not create TrackerResourcesClass object to register:'%s' class",
diff --git a/src/tracker-store/tracker-resource-class.h b/src/tracker-store/tracker-resource-class.h
index 7b9bb38..f39c140 100644
--- a/src/tracker-store/tracker-resource-class.h
+++ b/src/tracker-store/tracker-resource-class.h
@@ -27,9 +27,9 @@
 #include <glib-object.h>
 #include <libtracker-common/tracker-dbus.h>
 
-#define TRACKER_RESOURCES_CLASS_SERVICE	       "org.freedesktop.Tracker"
-#define TRACKER_RESOURCES_CLASS_PATH	       "/org/freedesktop/Tracker/Resources/Classes/%s"
-#define TRACKER_RESOURCES_CLASS_INTERFACE       "org.freedesktop.Tracker.Resources.Class"
+#define TRACKER_RESOURCES_CLASS_SERVICE	       "org.freedesktop.Tracker1"
+#define TRACKER_RESOURCES_CLASS_PATH	       "/org/freedesktop/Tracker1/Resources/Classes/%s"
+#define TRACKER_RESOURCES_CLASS_INTERFACE       "org.freedesktop.Tracker1.Resources.Class"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-store/tracker-resources.h b/src/tracker-store/tracker-resources.h
index c102926..1d7fe56 100644
--- a/src/tracker-store/tracker-resources.h
+++ b/src/tracker-store/tracker-resources.h
@@ -24,9 +24,9 @@
 
 #include <glib-object.h>
 
-#define TRACKER_RESOURCES_SERVICE	 "org.freedesktop.Tracker"
-#define TRACKER_RESOURCES_PATH		 "/org/freedesktop/Tracker/Resources"
-#define TRACKER_RESOURCES_INTERFACE	 "org.freedesktop.Tracker.Resources"
+#define TRACKER_RESOURCES_SERVICE	 "org.freedesktop.Tracker1"
+#define TRACKER_RESOURCES_PATH		 "/org/freedesktop/Tracker1/Resources"
+#define TRACKER_RESOURCES_INTERFACE	 "org.freedesktop.Tracker1.Resources"
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-store/tracker-statistics.h b/src/tracker-store/tracker-statistics.h
index f33ad9a..0b5d3d2 100644
--- a/src/tracker-store/tracker-statistics.h
+++ b/src/tracker-store/tracker-statistics.h
@@ -24,9 +24,9 @@
 
 #include <glib-object.h>
 
-#define TRACKER_STATISTICS_SERVICE     "org.freedesktop.Tracker"
-#define TRACKER_STATISTICS_PATH	       "/org/freedesktop/Tracker/Statistics"
-#define TRACKER_STATISTICS_INTERFACE   "org.freedesktop.Tracker.Statistics"
+#define TRACKER_STATISTICS_SERVICE     "org.freedesktop.Tracker1"
+#define TRACKER_STATISTICS_PATH	       "/org/freedesktop/Tracker1/Statistics"
+#define TRACKER_STATISTICS_INTERFACE   "org.freedesktop.Tracker1.Statistics"
 
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]