From feb98c4c3e21e34b1aeffc287531ff97a9d0616c Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sun, 6 Sep 2015 13:01:50 +0200
Subject: Retrieve strings directly from gschema

intltool 0.5.1 has support for gsettings schemas.
---
 configure.ac                       |  2 +-
 data/Makefile.am                   |  7 ++---
 data/org.mate.Atril.gschema.xml    | 54 ++++++++++++++++++++++++++++++++++++++
 data/org.mate.Atril.gschema.xml.in | 54 --------------------------------------
 4 files changed, 57 insertions(+), 60 deletions(-)
 create mode 100644 data/org.mate.Atril.gschema.xml
 delete mode 100644 data/org.mate.Atril.gschema.xml.in

diff --git a/configure.ac b/configure.ac
index e1650afe..340384ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ dnl FIXME: remove this when required gtk+ >= 2.19.7
 DISABLE_DEPRECATED=
 AC_SUBST([DISABLE_DEPRECATED])
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=atril
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/data/Makefile.am b/data/Makefile.am
index fedca7dd..e829efe0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -58,9 +58,7 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 #
 # GSettings schema
 #
-gsettingsschema_in_files = org.mate.Atril.gschema.xml.in
-# gsettings_SCHEMAS is a list of all the schemas you want to install
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+gsettings_SCHEMAS = org.mate.Atril.gschema.xml
 
 .PRECIOUS: $(gsettings_SCHEMAS)
 
@@ -99,7 +97,7 @@ EXTRA_DIST =					\
 	$(ui_DATA)				\
 	$(DESKTOP_IN_FILES)			\
 	$(appdata_in_files)			\
-	$(gsettingsschema_in_files)		\
+	$(gsettings_SCHEMAS)			\
 	org.mate.atril.Daemon.service.in	\
 	$(man_MANS)				\
 	atril.ico				\
@@ -115,7 +113,6 @@ CLEANFILES = \
 
 DISTCLEANFILES = \
 	$(DESKTOP_FILES)	\
-	$(gsettings_SCHEMAS)	\
 	$(service_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.mate.Atril.gschema.xml b/data/org.mate.Atril.gschema.xml
new file mode 100644
index 00000000..cd7de5c1
--- /dev/null
+++ b/data/org.mate.Atril.gschema.xml
@@ -0,0 +1,54 @@
+<schemalist>
+
+  <enum id="org.mate.Atril.SizingMode">
+    <value nick="best-fit" value="0"/>
+    <value nick="fit-width" value="1"/>
+    <value nick="free" value="2"/>
+  </enum>
+
+  <schema id="org.mate.Atril" path="/org/mate/atril/" gettext-domain="atril">
+    <key name="override-restrictions" type="b">
+      <default>true</default>
+      <summary>Override document restrictions</summary>
+      <description>Override document restrictions, like restriction to copy or to print.</description>
+    </key>
+    <child name="default" schema="org.mate.Atril.Default"/>
+  </schema>
+
+  <schema id="org.mate.Atril.Default" path="/org/mate/atril/default/" gettext-domain="atril">
+    <key name="show-toolbar" type="b">
+      <default>true</default>
+    </key>
+    <key name="show-sidebar" type="b">
+      <default>true</default>
+    </key>
+    <key name="window-ratio" type="(dd)">
+      <default>(0., 0.)</default>
+    </key>
+    <key name="sizing-mode" enum="org.mate.Atril.SizingMode">
+      <default>'fit-width'</default>
+    </key>
+    <key name="zoom" type="d">
+      <default>1.</default>
+    </key>
+    <key name="inverted-colors" type="b">
+      <default>false</default>
+    </key>
+    <key name="continuous" type="b">
+      <default>true</default>
+    </key>
+    <key name="dual-page" type="b">
+      <default>false</default>
+    </key>
+    <key name="fullscreen" type="b">
+      <default>false</default>
+    </key>
+    <key name="sidebar-page" type="s">
+      <default>'links'</default>
+    </key>
+    <key name="sidebar-size" type="i">
+      <default>132</default>
+    </key>
+  </schema>
+
+</schemalist>
diff --git a/data/org.mate.Atril.gschema.xml.in b/data/org.mate.Atril.gschema.xml.in
deleted file mode 100644
index fe7893ea..00000000
--- a/data/org.mate.Atril.gschema.xml.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<schemalist>
-
-  <enum id="org.mate.Atril.SizingMode">
-    <value nick="best-fit" value="0"/>
-    <value nick="fit-width" value="1"/>
-    <value nick="free" value="2"/>
-  </enum>
-
-  <schema id="org.mate.Atril" path="/org/mate/atril/" gettext-domain="atril">
-    <key name="override-restrictions" type="b">
-      <default>true</default>
-      <_summary>Override document restrictions</_summary>
-      <_description>Override document restrictions, like restriction to copy or to print.</_description>
-    </key>
-    <child name="default" schema="org.mate.Atril.Default"/>
-  </schema>
-
-  <schema id="org.mate.Atril.Default" path="/org/mate/atril/default/" gettext-domain="atril">
-    <key name="show-toolbar" type="b">
-      <default>true</default>
-    </key>
-    <key name="show-sidebar" type="b">
-      <default>true</default>
-    </key>
-    <key name="window-ratio" type="(dd)">
-      <default>(0., 0.)</default>
-    </key>
-    <key name="sizing-mode" enum="org.mate.Atril.SizingMode">
-      <default>'fit-width'</default>
-    </key>
-    <key name="zoom" type="d">
-      <default>1.</default>
-    </key>
-    <key name="inverted-colors" type="b">
-      <default>false</default>
-    </key>
-    <key name="continuous" type="b">
-      <default>true</default>
-    </key>
-    <key name="dual-page" type="b">
-      <default>false</default>
-    </key>
-    <key name="fullscreen" type="b">
-      <default>false</default>
-    </key>
-    <key name="sidebar-page" type="s">
-      <default>'links'</default>
-    </key>
-    <key name="sidebar-size" type="i">
-      <default>132</default>
-    </key>
-  </schema>
-
-</schemalist>
-- 
cgit v1.2.1