[gnome-photos/wip/rishi/tracker-domain-application-id] build: Don't hard code the application ID in the Tracker domain config




commit 1ef5141c8284818d24094192f0644c922b6ce7e1
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Mar 4 19:56:29 2021 +0100

    build: Don't hard code the application ID in the Tracker domain config

 data/meson.build                                        | 1 +
 data/org.gnome.Photos.Tracker1.Miner.Extract.service.in | 4 ++--
 data/org.gnome.Photos.Tracker1.Miner.Files.service.in   | 4 ++--
 data/org.gnome.Photos.rule.in                           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index f51a4511..279dd536 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -46,6 +46,7 @@ configure_file(
 )
 
 tracker_domain_conf = configuration_data()
+tracker_domain_conf.set('application_id', photos_namespace)
 tracker_domain_conf.set('libexecdir', photos_libexecdir)
 
 domain_ontology_rule = photos_namespace + '.rule'
diff --git a/data/org.gnome.Photos.Tracker1.Miner.Extract.service.in 
b/data/org.gnome.Photos.Tracker1.Miner.Extract.service.in
index 4f2272e5..e4d33255 100644
--- a/data/org.gnome.Photos.Tracker1.Miner.Extract.service.in
+++ b/data/org.gnome.Photos.Tracker1.Miner.Extract.service.in
@@ -1,6 +1,6 @@
 [D-BUS Service]
-Name=org.gnome.Photos.Tracker1.Miner.Extract
-Exec=@libexecdir@/tracker-extract --domain-ontology org.gnome.Photos
+Name=@application_id@.Tracker1.Miner.Extract
+Exec=@libexecdir@/tracker-extract --domain-ontology @application_id@
 
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Extract
diff --git a/data/org.gnome.Photos.Tracker1.Miner.Files.service.in 
b/data/org.gnome.Photos.Tracker1.Miner.Files.service.in
index 3bf53ec8..c0310964 100644
--- a/data/org.gnome.Photos.Tracker1.Miner.Files.service.in
+++ b/data/org.gnome.Photos.Tracker1.Miner.Files.service.in
@@ -1,6 +1,6 @@
 [D-BUS Service]
-Name=org.gnome.Photos.Tracker1.Miner.Files
-Exec=@libexecdir@/tracker-miner-fs --initial-sleep=0 --domain-ontology org.gnome.Photos
+Name=@application_id@.Tracker1.Miner.Files
+Exec=@libexecdir@/tracker-miner-fs --initial-sleep=0 --domain-ontology @application_id@
 
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker1/Miner/Files
diff --git a/data/org.gnome.Photos.rule.in b/data/org.gnome.Photos.rule.in
index e2d2bdfe..38a4c397 100644
--- a/data/org.gnome.Photos.rule.in
+++ b/data/org.gnome.Photos.rule.in
@@ -29,7 +29,7 @@ OntologyName=nepomuk
 # services related to this domain ontology.
 #
 # eg. org.gnome.Photos
-Domain=org.gnome.Photos
+Domain=@application_id@
 
 # Miners that the domain ontology will require. This is
 # purely a hint (mainly for libtracker-control), and not


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]