[tracker-miners/sam/music: 2/2] tracker-miner-fs: Use correct domain name
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/music: 2/2] tracker-miner-fs: Use correct domain name
- Date: Mon, 6 Jul 2020 09:36:50 +0000 (UTC)
commit 87878902bf3d5aa8758d88d711eb343df6995b44
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 1cefeae6b..95e1e6fe1 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]