From df7a7488950139e3884972e2363294051e33d45d Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Sun, 6 Sep 2015 21:55:35 +0200
Subject: Rework gsettings schema building

 * Bump intltool required version for gsettings support
 * Extract strings with intltool directly
 * Let autoconf generate the xml files
---
 timerapplet/Makefile.am                              | 10 ++++------
 .../org.mate.panel.applet.timer.gschema.xml.in       | 20 ++++++++++++++++++++
 .../org.mate.panel.applet.timer.gschema.xml.in.in    | 20 --------------------
 3 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 timerapplet/org.mate.panel.applet.timer.gschema.xml.in
 delete mode 100644 timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in

(limited to 'timerapplet')

diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am
index 5ace281b..bc276f69 100644
--- a/timerapplet/Makefile.am
+++ b/timerapplet/Makefile.am
@@ -33,15 +33,13 @@ org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files)
 		$< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.timer.gschema.xml
+timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in
+gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 EXTRA_DIST = \
 	$(applets_in_files).in \
 	$(service_in_files) \
-	$(gsettings_SCHEMAS).in.in
+	$(timer_gschema_in_files)
 
-CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in
new file mode 100644
index 00000000..1201c8a6
--- /dev/null
+++ b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in
@@ -0,0 +1,20 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.timer">
+    <key name="name" type="s">
+      <default>'Timer'</default>
+      <summary>Name of timer</summary>
+    </key>
+    <key name="duration" type="i">
+      <default>10</default>
+      <summary>Duration of timer in seconds</summary>
+    </key>
+    <key name="show-notification" type="b">
+      <default>true</default>
+      <summary>Show notification popup when timer finish</summary>
+    </key>
+    <key name="show-dialog" type="b">
+      <default>false</default>
+      <summary>Show dialog window when timer finish</summary>
+    </key>
+  </schema>
+</schemalist>
diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in
deleted file mode 100644
index 8e2b40b9..00000000
--- a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.timer">
-    <key name="name" type="s">
-      <default>'Timer'</default>
-      <_summary>Name of timer</_summary>
-    </key>
-    <key name="duration" type="i">
-      <default>10</default>
-      <_summary>Duration of timer in seconds</_summary>
-    </key>
-    <key name="show-notification" type="b">
-      <default>true</default>
-      <_summary>Show notification popup when timer finish</_summary>
-    </key>
-    <key name="show-dialog" type="b">
-      <default>false</default>
-      <_summary>Show dialog window when timer finish</_summary>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1