tracker-store: Make DBus unique name purely dependent on the domain

i.e. just remove the ontology name from there. We do add the ".Tracker1"
suffix though, just so Tracker gets its own namespace dependent on it, eg:
org.gnome.Photos.Tracker1
org.gnome.Photos.Tracker1.Miner.Files
org.gnome.Photos.Tracker1.Miner.Extract

2 files changed, 9 insertions, 17 deletions

diff --git a/src/tracker-store/tracker-dbus.vala b/src/tracker-store/tracker-dbus.vala
index ef6e709a5..1a44a978c 100644
--- a/src/tracker-store/tracker-dbus.vala
+++ b/src/tracker-store/tracker-dbus.vala
@@ -77,25 +77,17 @@ public class Tracker.DBus {
 		}
 	}
 
-	public static bool register_names (string? domain, string? ontology_name) {
-		/* Register the service name for org.freedesktop.Tracker */
-		
+	public static bool register_names (string? domain) {
+		string service_name;
+
 		if (domain != null) {
-			if (ontology_name != null) {
-				if (!dbus_register_service (domain+"."+ontology_name)) {
-					return false;
-				}
-			} else {
-				if (!dbus_register_service (domain)) {
-					return false;
-				}
-			}
+			service_name = domain;
 		} else {
-			if (!dbus_register_service (SERVICE)) {
-				return false;
-			}
+			/* Register the service name for org.freedesktop.Tracker */
+			service_name = SERVICE;
 		}
-		return true;
+
+		return dbus_register_service (service_name);
 	}
 
 	public static bool init (Tracker.Config config_p) {
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala
index 96825893c..3051d7693 100644
--- a/src/tracker-store/tracker-main.vala
+++ b/src/tracker-store/tracker-main.vala
@@ -300,7 +300,7 @@ License which can be viewed at:
 			return 1;
 		}
 
-		if (!Tracker.DBus.register_names (domain, ontology_name)) {
+		if (!Tracker.DBus.register_names (domain)) {
 			return 1;
 		}