summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-09-06 13:01:50 +0200
committerinfirit <[email protected]>2015-09-06 13:36:38 +0200
commitfeb98c4c3e21e34b1aeffc287531ff97a9d0616c (patch)
tree07c8a136249d87e157ee1b4bad7955355f86a0ee
parentd951346243735878fe430d32ca10076fcb3300f2 (diff)
downloadatril-feb98c4c3e21e34b1aeffc287531ff97a9d0616c.tar.bz2
atril-feb98c4c3e21e34b1aeffc287531ff97a9d0616c.tar.xz
Retrieve strings directly from gschema
intltool 0.5.1 has support for gsettings schemas.
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am7
-rw-r--r--data/org.mate.Atril.gschema.xml (renamed from data/org.mate.Atril.gschema.xml.in)4
3 files changed, 5 insertions, 8 deletions
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.in b/data/org.mate.Atril.gschema.xml
index fe7893ea..cd7de5c1 100644
--- a/data/org.mate.Atril.gschema.xml.in
+++ b/data/org.mate.Atril.gschema.xml
@@ -9,8 +9,8 @@
<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>
+ <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>