From 622735a9f6f7ca7745d48b280d5efa22833fcada Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Thu, 2 Apr 2015 18:41:16 +0100
Subject: Drop unnecessary double indirection when generating schemas

We don't need to expand the gettext package symbol: we know we are using
gnome-dictionary, and we're not going to change it.

We also should take extra-care to have intltool not merge the
translations into the XML itself, otherwise glib-compile-schemas will
rightfully complain about invalid XML.
---
 configure.ac                                |  1 -
 data/Makefile.am                            |  3 +++
 data/org.gnome.dictionary.gschema.xml.in    | 25 +++++++++++++++++++++++++
 data/org.gnome.dictionary.gschema.xml.in.in | 25 -------------------------
 po/POTFILES.in                              |  2 +-
 5 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 data/org.gnome.dictionary.gschema.xml.in
 delete mode 100644 data/org.gnome.dictionary.gschema.xml.in.in

diff --git a/configure.ac b/configure.ac
index 5021b00..9e7ff81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,6 @@ AC_CONFIG_FILES([
         libgdict/gdict-version.h
         libgdict/gdict-1.0.pc
         data/Makefile
-        data/org.gnome.dictionary.gschema.xml.in
         docs/Makefile
         docs/reference/Makefile
         docs/reference/gdict/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 103782f..78be666 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -53,4 +53,7 @@ CLEANFILES += $(gsettings_SCHEMAS) \
 	
 @GSETTINGS_RULES@
 
+%.gschema.xml: %.gschema.xml.in
+	$(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@
+
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.dictionary.gschema.xml.in b/data/org.gnome.dictionary.gschema.xml.in
new file mode 100644
index 0000000..cd7312d
--- /dev/null
+++ b/data/org.gnome.dictionary.gschema.xml.in
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="org.gnome.dictionary" path="/org/gnome/dictionary/" gettext-domain="gnome-dictionary">
+    <key name="database" type="s">
+      <default>'!'</default>
+      <_summary>The default database to use</_summary>
+      <_description>The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark ("!") means that all the databases present in a dictionary source should be searched</_description>
+    </key>
+    <key name="strategy" type="s">
+      <default>'exact'</default>
+      <_summary>The default search strategy to use</_summary>
+      <_description>The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words.</_description>
+    </key>
+    <key name="print-font" type="s">
+      <default>'Serif 12'</default>
+      <_summary>The font to be used when printing</_summary>
+      <_description>The font to be used when printing a definition.</_description>
+    </key>
+    <key name="source-name" type="s">
+      <default>'Default'</default>
+      <_summary>The name of the dictionary source used</_summary>
+      <_description>The name of the dictionary source used to retrieve the definitions of words.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.dictionary.gschema.xml.in.in b/data/org.gnome.dictionary.gschema.xml.in.in
deleted file mode 100644
index a04f3b4..0000000
--- a/data/org.gnome.dictionary.gschema.xml.in.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <schema id="org.gnome.dictionary" path="/org/gnome/dictionary/" gettext-domain="@GETTEXT_PACKAGE@">
-    <key name="database" type="s">
-      <default>'!'</default>
-      <_summary>The default database to use</_summary>
-      <_description>The name of the default individual database or meta-database to use on a dictionary source. An exclamation mark ("!") means that all the databases present in a dictionary source should be searched</_description>
-    </key>
-    <key name="strategy" type="s">
-      <default>'exact'</default>
-      <_summary>The default search strategy to use</_summary>
-      <_description>The name of the default search strategy to use on a dictionary source, if available. The default strategy is 'exact', that is match exact words.</_description>
-    </key>
-    <key name="print-font" type="s">
-      <default>'Serif 12'</default>
-      <_summary>The font to be used when printing</_summary>
-      <_description>The font to be used when printing a definition.</_description>
-    </key>
-    <key name="source-name" type="s">
-      <default>'Default'</default>
-      <_summary>The name of the dictionary source used</_summary>
-      <_description>The name of the dictionary source used to retrieve the definitions of words.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b8aa0cf..0174534 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@ data/org.gnome.Dictionary.appdata.xml.in
 [type: gettext/glade]src/gdict-pref-dialog.ui
 [type: gettext/glade]src/gdict-source-dialog.ui
 data/org.gnome.Dictionary.desktop.in.in
-data/org.gnome.dictionary.gschema.xml.in.in
+data/org.gnome.dictionary.gschema.xml
 data/spanish.desktop.in
 data/thai.desktop.in
 libgdict/gdict-client-context.c
-- 
cgit v1.2.1