[tracker-miners/sam/index-location: 7/8] tracker-miner-fs: Use correct domain name

[Sam Thursfield <sthursfield src gnome org>]

commit 5247ae58a296ee9142c325de223dc9b0ec2f92a6
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jul 1 13:14:49 2020 +0200

    tracker-miner-fs: Use correct domain name
    
    If the --domain-ontology argument gave the full path to the domain
    rule, we would previously do the wrong thing, leading to errors like
    this:
    
        (tracker-miner-fs-3:2): Tracker-DEBUG: 12:57:48.820: Setting up watch on tracker-extract at 
/app/share/tracker3/domain-ontologies/org.gnome.Music.Devel.domain.rule.Tracker3.Miner.Extract (autostart: 
yes)
    
        (tracker-miner-fs-3:2): GLib-GIO-CRITICAL **: 12:57:48.820: g_bus_watch_name: assertion 
'g_dbus_is_name (name)' failed
    
    Now we correctly get the name from the domain rule file.

 src/miners/fs/tracker-miner-files.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index be4d11774..8033dceb0 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -377,6 +377,7 @@ miner_files_initable_init (GInitable     *initable,
        GSList *mounts = NULL;
        GSList *dirs;
        GSList *m;
+       gchar *domain_name;
 
        /* Chain up parent's initable callback before calling child's one */
        if (!miner_files_initable_parent_iface->init (initable, cancellable, &inner_error)) {
@@ -644,9 +645,11 @@ miner_files_initable_init (GInitable     *initable,
 
        disk_space_check_start (mf);
 
-       mf->private->extract_watchdog = tracker_extract_watchdog_new (mf->private->domain);
+       domain_name = tracker_domain_ontology_get_domain (mf->private->domain_ontology, NULL);
+       mf->private->extract_watchdog = tracker_extract_watchdog_new (domain_name);
        g_signal_connect (mf->private->extract_watchdog, "lost",
                          G_CALLBACK (on_extractor_lost), mf);
+       g_free (domain_name);
 
        return TRUE;
 }