[tracker/wip/carlosg/domain-ontologies: 3/20] tracker-store: Remove dbus_path domain ontologies setting

[Carlos Garnacho <carlosg src gnome org>]

commit e7896078fd980c5866820134241b995129d1993d
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jun 18 23:28:08 2017 +0200

    tracker-store: Remove dbus_path domain ontologies setting

 src/tracker-store/tracker-dbus.vala |    2 +-
 src/tracker-store/tracker-main.vala |   10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/src/tracker-store/tracker-dbus.vala b/src/tracker-store/tracker-dbus.vala
index d96473d..ef6e709 100644
--- a/src/tracker-store/tracker-dbus.vala
+++ b/src/tracker-store/tracker-dbus.vala
@@ -77,7 +77,7 @@ public class Tracker.DBus {
                }
        }
 
-       public static bool register_names (string? domain, string? dbus_path, string? ontology_name) {
+       public static bool register_names (string? domain, string? ontology_name) {
                /* Register the service name for org.freedesktop.Tracker */
                
                if (domain != null) {
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala
index e6b0eb6..18f5e54 100644
--- a/src/tracker-store/tracker-main.vala
+++ b/src/tracker-store/tracker-main.vala
@@ -50,7 +50,6 @@ License which can be viewed at:
        static string cache_location;
        static string data_location;
        static string ontology_location;
-       static string dbus_path;
        static string domain;
        static string ontology_name;
 
@@ -65,7 +64,6 @@ License which can be viewed at:
                { "domain-ontology", 'd', 0, OptionArg.STRING, ref domain_ontology, N_("Load a specified 
domain ontology"), null },
                { "domain", 'a', 0, OptionArg.STRING, ref domain, N_("Override domain to be used"), null },
                { "ontology-name", 'o', 0, OptionArg.STRING, ref ontology_name, N_("Override ontology name to 
be used"), null },
-               { "dbus-path", 'p', 0, OptionArg.STRING, ref dbus_path, N_("Override DBus path to be used"), 
null },
                { "cache-location", 'c', 0, OptionArg.STRING, ref cache_location, N_("Override cache location 
to be used"), null },
                { "data-location", 'm', 0, OptionArg.STRING, ref data_location, N_("Override data location to 
be used"), null },
                { "ontology-location", 'n', 0, OptionArg.STRING, ref ontology_location, N_("Override ontology 
location to be used"), null },
@@ -262,12 +260,6 @@ License which can be viewed at:
                                } catch (KeyFileError m) {}
 
                                try {
-                                       string? loaded_dbus_path = keyfile.get_string ("DomainOntology", 
"DBusPath");
-                                       if (dbus_path == null)
-                                               dbus_path = loaded_dbus_path;
-                               } catch (KeyFileError m) {}
-
-                               try {
                                        string? loaded_domain = keyfile.get_string ("DomainOntology", 
"Domain");
                                        if (domain == null)
                                                domain = loaded_domain;
@@ -315,7 +307,7 @@ License which can be viewed at:
                        return 1;
                }
 
-               if (!Tracker.DBus.register_names (domain, dbus_path, ontology_name)) {
+               if (!Tracker.DBus.register_names (domain, ontology_name)) {
                        return 1;
                }