From 9beb2876641d84bdbfd5860dae998d3ac50d386c Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 8 Sep 2015 14:23:02 +0200
Subject: Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
---
 configure.ac                             | 2 +-
 data/Makefile.am                         | 5 +++--
 data/org.mate.screensaver.gschema.xml.in | 4 ++--
 po/POTFILES.in                           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8e6862e..0b28f38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_CONFIG_HEADERS(config.h)
 
 AM_MAINTAINER_MODE
 
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_STDC_HEADERS
diff --git a/data/Makefile.am b/data/Makefile.am
index 70ac481..72f2e91 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,14 +43,15 @@ dbussessionservice_DATA = org.mate.ScreenSaver.service
 @GSETTINGS_RULES@
 @INTLTOOL_XML_NOMERGE_RULE@
 
-gsettings_SCHEMAS = org.mate.screensaver.gschema.xml
+gsettingsschema_in_files = org.mate.screensaver.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
 migrationdir = $(datadir)/MateConf/gsettings
 dist_migration_DATA = org.mate.screensaver.gschema.migrate
 
 
 EXTRA_DIST = 				\
-	$(gsettings_SCHEMAS).in		\
+	$(gsettingsschema_in_files)	\
 	$(desktop_in_files)		\
 	$(directory_in_files)		\
 	$(gtkbuilder_DATA)		\
diff --git a/data/org.mate.screensaver.gschema.xml.in b/data/org.mate.screensaver.gschema.xml.in
index 5cdb071..7671144 100644
--- a/data/org.mate.screensaver.gschema.xml.in
+++ b/data/org.mate.screensaver.gschema.xml.in
@@ -1,10 +1,10 @@
-<schemalist>
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
   <enum id="org.mate.screensaver.Mode">
     <value nick="blank-only" value="0"/>
     <value nick="random" value="1"/>
     <value nick="single" value="2"/>
   </enum>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.screensaver" path="/org/mate/screensaver/">
+  <schema id="org.mate.screensaver" path="/org/mate/screensaver/">
     <key name="idle-activation-enabled" type="b">
       <default>true</default>
       <summary>Activate when idle</summary>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1bfdc2d..ed32f78 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ data/mate-screensaver-preferences.desktop.in
 data/mate-screensaver.directory.in
 data/images/cosmos/cosmos.xml.in.in
 [type: gettext/glade]data/lock-dialog-default.ui
-data/org.mate.screensaver.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.screensaver.gschema.xml.in
 savers/cosmos-slideshow.desktop.in.in
 savers/footlogo-floaters.desktop.in.in
 savers/gnomelogo-floaters.desktop.in.in
-- 
cgit v1.2.1