Merge branch 'wip/piotrdrag/kill-intltool'

14 files changed, 34 insertions, 65 deletions

diff --git a/.gitignore b/.gitignore
index f7c26f2cc..c02b11952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,9 +30,6 @@ depcomp
 gtk-doc.make
 install-sh
 install.rdf
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 libtool
 ltmain.sh
 missing
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 55d518a7a..48881a56a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,18 +2,18 @@
 # Please keep this file sorted alphabetically.
 src/libtracker-common/tracker-dbus.c
 src/libtracker-common/tracker-utils.c
-src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
-src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
+src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml
 src/libtracker-data/tracker-collation.c
 src/libtracker-data/tracker-data-backup.c
+src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml
 src/libtracker-miner/tracker-data-provider.c
 src/libtracker-miner/tracker-miner-fs.c
 src/libtracker-miner/tracker-miner-object.c
 src/libtracker-miner/tracker-miner-online.c
 src/libtracker-miner/tracker-miner-proxy.c
+src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml
 src/tracker-store/tracker-main.vala
-src/tracker-store/tracker-store.desktop.in.in
-src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
+src/tracker-store/tracker-store.desktop.in
 src/tracker/tracker-config.c
 src/tracker/tracker-daemon.c
 src/tracker/tracker-dbus.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 83fbf7af9..9f078f564 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
 src/tracker-store/tracker-main.c
-src/tracker-store/tracker-store.desktop.in
diff --git a/src/libtracker-data/.gitignore b/src/libtracker-data/.gitignore
index 2fc8613a9..5d33cf879 100644
--- a/src/libtracker-data/.gitignore
+++ b/src/libtracker-data/.gitignore
@@ -5,6 +5,5 @@ tracker-sparql-query.[ch]
 tracker-sparql-query.vapi
 tracker-sparql-scanner.c
 tracker-turtle-reader.c
-*.xml
 *.valid
 *.cfg.5
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index 42323d26d..b5d4f3cb7 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -79,9 +79,5 @@ tracker_data_dep = declare_dependency(
     sources: enums[1],
 )
 
-custom_target('libtracker-data-settings-schema',
-    input: 'org.freedesktop.Tracker.DB.gschema.xml.in',
-    output: 'org.freedesktop.Tracker.DB.gschema.xml',
-    command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
-    install: true,
+install_data('org.freedesktop.Tracker.DB.gschema.xml',
     install_dir: gsettings_schema_dir)
diff --git a/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in b/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml
index dc15e89c5..4ba632e3d 100644
--- a/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
+++ b/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml
@@ -21,13 +21,13 @@ Boston, MA  02110-1301, USA.
   <schema id="org.freedesktop.Tracker.DB" path="/org/freedesktop/tracker/db/" gettext-domain="tracker">
     <key name="journal-chunk-size" type="i">
       <default>50</default>
-      <_summary>Maximum size of journal</_summary>
-      <_description>Size of the journal at rotation in MB. Use -1 to disable rotating.</_description>
+      <summary>Maximum size of journal</summary>
+      <description>Size of the journal at rotation in MB. Use -1 to disable rotating.</description>
     </key>
     <key name="journal-rotate-destination" type="s">
       <default>''</default>
-      <_summary>Location of journal pieces</_summary>
-      <_description>Where to store a journal chunk when it hits the max size.</_description>
+      <summary>Location of journal pieces</summary>
+      <description>Where to store a journal chunk when it hits the max size.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/src/libtracker-fts/.gitignore b/src/libtracker-fts/.gitignore
index 5af0ddf8c..752b976e6 100644
--- a/src/libtracker-fts/.gitignore
+++ b/src/libtracker-fts/.gitignore
@@ -1,3 +1,2 @@
-*.xml
 *.valid
 *.cfg.5
diff --git a/src/libtracker-fts/meson.build b/src/libtracker-fts/meson.build
index cbfe553a1..1392699f8 100644
--- a/src/libtracker-fts/meson.build
+++ b/src/libtracker-fts/meson.build
@@ -22,9 +22,5 @@ tracker_fts_dep = declare_dependency(
     dependencies: libtracker_fts_dependencies
 )
 
-custom_target('libtracker-fts-settings-schema',
-    input: 'org.freedesktop.Tracker.FTS.gschema.xml.in',
-    output: 'org.freedesktop.Tracker.FTS.gschema.xml',
-    command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
-    install: true,
+install_data('org.freedesktop.Tracker.FTS.gschema.xml',
     install_dir: gsettings_schema_dir)
diff --git a/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in b/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml
index 1efd2c707..1eb14f47a 100644
--- a/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
+++ b/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml
@@ -23,37 +23,37 @@ Boston, MA  02110-1301, USA.
     <key name="max-word-length" type="i">
       <default>30</default>
       <range min="0" max="200"/>
-      <_summary>Maximum length of a word to be indexed</_summary>
-      <_description>Words with more characters than this length will be ignored by the indexer.</_description>
+      <summary>Maximum length of a word to be indexed</summary>
+      <description>Words with more characters than this length will be ignored by the indexer.</description>
     </key>
 
     <key name="max-words-to-index" type="i">
       <default>10000</default>
-      <_summary>Maximum number of words to index in a document</_summary>
-      <_description>Indexer will read only this maximum number of words from a single document.</_description>
+      <summary>Maximum number of words to index in a document</summary>
+      <description>Indexer will read only this maximum number of words from a single document.</description>
     </key>
 
     <key name="enable-stemmer" type="b">
-      <_summary>Enable stemmer</_summary>
-      <_description>Simplify the words to their root to provide more results. E.g. “shelves” and “shelf” to “shel”</_description>
+      <summary>Enable stemmer</summary>
+      <description>Simplify the words to their root to provide more results. E.g. “shelves” and “shelf” to “shel”</description>
       <default>false</default>
     </key>
 
     <key name="enable-unaccent" type="b">
-      <_summary>Enable unaccent</_summary>
-      <_description>Translate accented characters to the equivalent unaccented. E.g. “Idéa” to “Idea” for improved matching. </_description>
+      <summary>Enable unaccent</summary>
+      <description>Translate accented characters to the equivalent unaccented. E.g. “Idéa” to “Idea” for improved matching. </description>
       <default>true</default>
     </key>
 
     <key name="ignore-numbers" type="b">
-      <_summary>Ignore numbers</_summary>
-      <_description>If enabled, numbers will not be indexed.</_description>
+      <summary>Ignore numbers</summary>
+      <description>If enabled, numbers will not be indexed.</description>
       <default>true</default>
     </key>
 
     <key name="ignore-stop-words" type="b">
-      <_summary>Ignore stop words</_summary>
-      <_description>If enabled, the words listed in the stop-words list are ignored. E.g. common words like “the”, “yes”, “no”, etc.</_description>
+      <summary>Ignore stop words</summary>
+      <description>If enabled, the words listed in the stop-words list are ignored. E.g. common words like “the”, “yes”, “no”, etc.</description>
       <default>true</default>
     </key>
 
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
index 6d5b12ff9..f90c2903f 100644
--- a/src/tracker-store/.gitignore
+++ b/src/tracker-store/.gitignore
@@ -9,6 +9,5 @@ tracker-steroids.c
 tracker-store.c
 tracker-store.h
 *.service
-*.xml
 *.valid
 *.cfg.5
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index bf0d966a9..8d69ae572 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -47,15 +47,11 @@ dbus_service_file = configure_file(
     install: true,
     install_dir: dbus_services_dir)
 
-desktop_file_untranslated = configure_file(
-    input: 'tracker-store.desktop.in.in',
-    output: 'tracker-store.desktop.in',
-    configuration: conf)
-
-desktop_file = custom_target('tracker-store-desktop-file',
-    input: desktop_file_untranslated,
+i18n.merge_file('tracker-store-desktop-file',
+    type: 'desktop',
+    input: 'tracker-store.desktop.in',
     output: 'tracker-store.desktop',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
+    po_dir: po_subdir,
     install: true,
     install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
 
@@ -68,18 +64,10 @@ if install_systemd_user_services
       install_dir: systemd_user_services_dir)
 endif
 
-custom_target('tracker-store-settings-schema',
-    input: 'org.freedesktop.Tracker.Store.gschema.xml.in',
-    output: 'org.freedesktop.Tracker.Store.gschema.xml',
-    command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
-    install: true,
+install_data('org.freedesktop.Tracker.Store.gschema.xml',
     install_dir: gsettings_schema_dir)
 
-custom_target('tracker-store-settings-schemalist',
-    input: 'org.freedesktop.Tracker.gschema.xml.in',
-    output: 'org.freedesktop.Tracker.gschema.xml',
-    command: ['intltool-merge', '--quiet', '--xml-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'],
-    install: true,
+install_data('org.freedesktop.Tracker.gschema.xml',
     install_dir: gsettings_schema_dir)
 
 custom_target('tracker-store-settings-enums',
diff --git a/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in b/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml
index f5e9f9623..a5997912b 100644
--- a/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
+++ b/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml
@@ -21,13 +21,13 @@ Boston, MA  02110-1301, USA.
   <schema id="org.freedesktop.Tracker.Store" path="/org/freedesktop/tracker/store/" gettext-domain="tracker">
     <key name="verbosity" enum="org.freedesktop.Tracker.TrackerVerbosity">
       <default>'errors'</default>
-      <_summary>Log verbosity</_summary>
-      <_description>Log verbosity.</_description>
+      <summary>Log verbosity</summary>
+      <description>Log verbosity.</description>
     </key>
     <key name="graphupdated-delay" type="i">
       <default>1000</default>
-      <_summary>GraphUpdated delay</_summary>
-      <_description>Period in milliseconds between GraphUpdated signals being emitted when indexed data has changed inside the database.</_description>
+      <summary>GraphUpdated delay</summary>
+      <description>Period in milliseconds between GraphUpdated signals being emitted when indexed data has changed inside the database.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/src/tracker-store/org.freedesktop.Tracker.gschema.xml.in b/src/tracker-store/org.freedesktop.Tracker.gschema.xml
index e6007bbd2..e6007bbd2 100644
--- a/src/tracker-store/org.freedesktop.Tracker.gschema.xml.in
+++ b/src/tracker-store/org.freedesktop.Tracker.gschema.xml
diff --git a/src/tracker-store/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in
index e0a3fefeb..985d19f02 100644
--- a/src/tracker-store/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Tracker Store
-_Comment=Metadata database store and lookup manager
+Name=Tracker Store
+Comment=Metadata database store and lookup manager
 Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
 Terminal=false
 Type=Application
@@ -11,7 +11,3 @@ X-KDE-StartupNotify=false
 X-KDE-UniqueApplet=true
 NoDisplay=true
 OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Store
-X-GNOME-Bugzilla-Version=@VERSION@