tracker_domain_ontology_get_domain() should return only the domain name

We should be consistent about what the name of a Tracker domain actually
is. In the domain rule we specify Domain=org.freedesktop (for the
default rule) or Domain=org.example.App (for a custom domain). But
internally tracker_domain_ontology_get_domain() would return
org.freedesktop.Tracker1 or org.example.App.Tracker1, i.e. the domain
name now has '.Tracker1' appended.

This does make sense in most cases, but it means there's no way to get
the actual name of the domain from a TrackerDomainOntology object. This
commit changes the existing function to not append '.Tracker1' in the
value it returns, which means that function can now be used to get the
base name of the domain. The assumption is that callers are normally
appending stuff to this base name anyway so it's not much extra effect
to also append the '.Tracker1' component if needed.

libtracker-common is internal to Tracker so this doesn't constitute a
public API break.

5 files changed, 14 insertions, 10 deletions

diff --git a/src/libtracker-common/tracker-domain-ontology.c b/src/libtracker-common/tracker-domain-ontology.c
index 7fc55f8c9..65a3fda0b 100644
--- a/src/libtracker-common/tracker-domain-ontology.c
+++ b/src/libtracker-common/tracker-domain-ontology.c
@@ -459,9 +459,9 @@ tracker_domain_ontology_get_domain (TrackerDomainOntology *domain_ontology,
 
 	priv = tracker_domain_ontology_get_instance_private (domain_ontology);
 	if (suffix)
-		return g_strconcat (priv->domain, ".Tracker1.", suffix, NULL);
+		return g_strconcat (priv->domain, ".", suffix, NULL);
 	else
-		return g_strconcat (priv->domain, ".Tracker1", NULL);
+		return g_strconcat (priv->domain, NULL);
 }
 
 gboolean
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index 59e222fdf..84bb15442 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -696,7 +696,7 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
 		return NULL;
 	}
 
-	prefix = tracker_domain_ontology_get_domain (priv->domain_ontology, "Miner");
+	prefix = tracker_domain_ontology_get_domain (priv->domain_ontology, "Tracker1.Miner");
 
 	g_variant_get (v, "(as)", &iter);
 	while (g_variant_iter_loop (iter, "&s", &str)) {
@@ -723,7 +723,7 @@ check_file (GFile    *file,
 	TrackerMinerManager *manager;
 	TrackerMinerManagerPrivate *priv;
 	GKeyFile *key_file;
-	gchar *path, *dbus_path, *display_name, *name_suffix, *description;
+	gchar *path, *dbus_path, *display_name, *name_suffix, *full_name_suffix, *description;
 	GError *error = NULL;
 	MinerData *data;
 
@@ -768,8 +768,12 @@ check_file (GFile    *file,
 	data = g_slice_new0 (MinerData);
 	data->dbus_path = dbus_path;
 	data->name_suffix = name_suffix;
+
+	full_name_suffix = g_strconcat ("Tracker1.", name_suffix, NULL);
 	data->dbus_name = tracker_domain_ontology_get_domain (priv->domain_ontology,
-	                                                      name_suffix);
+	                                                      full_name_suffix);
+	g_free (full_name_suffix);
+
 	data->display_name = display_name;
 	data->description = description;    /* In .desktop file as _comment */
 
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql-backend/tracker-backend.vala
index cc6d23c43..e46725ff5 100644
--- a/src/libtracker-sparql-backend/tracker-backend.vala
+++ b/src/libtracker-sparql-backend/tracker-backend.vala
@@ -192,7 +192,7 @@ class Tracker.Sparql.Backend : Connection {
 
 		switch (backend) {
 		case Backend.AUTO:
-			bus = new Tracker.Bus.Connection (domain_ontology.get_domain ());
+			bus = new Tracker.Bus.Connection (domain_ontology.get_domain ("Tracker1"));
 
 			try {
 				direct = create_readonly_direct ();
@@ -207,7 +207,7 @@ class Tracker.Sparql.Backend : Connection {
 			break;
 
 		case Backend.BUS:
-			bus = new Tracker.Bus.Connection (domain_ontology.get_domain ());
+			bus = new Tracker.Bus.Connection (domain_ontology.get_domain ("Tracker1"));
 			break;
 
 		default:
diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c
index 72b29da65..d0cf748b3 100644
--- a/src/libtracker-sparql/tracker-notifier.c
+++ b/src/libtracker-sparql/tracker-notifier.c
@@ -713,7 +713,7 @@ tracker_notifier_initable_init (GInitable     *initable,
 	if (!domain_ontology)
 		return FALSE;
 
-	dbus_name = tracker_domain_ontology_get_domain (domain_ontology, NULL);
+	dbus_name = tracker_domain_ontology_get_domain (domain_ontology, "Tracker1");
 
 	priv->has_arg0_filter =
 		priv->expanded_classes && g_strv_length (priv->expanded_classes) == 1;
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala
index 861aed2eb..935ebc8d1 100644
--- a/src/tracker-store/tracker-main.vala
+++ b/src/tracker-store/tracker-main.vala
@@ -240,7 +240,7 @@ License which can be viewed at:
 		cache_location = domain_ontology_config.get_cache ();
 		data_location = domain_ontology_config.get_journal ();
 		ontology_location = domain_ontology_config.get_ontology ();
-		domain = domain_ontology_config.get_domain ();
+		domain = domain_ontology_config.get_domain ("Tracker1");
 
 		sanity_check_option_values (config);
 
@@ -319,7 +319,7 @@ License which can be viewed at:
 		if (!shutdown) {
 			main_loop = new MainLoop ();
 
-			if (domain != null)
+			if (domain_ontology != null)
 				Tracker.DBus.watch_domain (domain_ontology, main_loop);
 
 			initialize_signal_handler ();