From ca8ca6923e74bb307bfe6c99c691399987eda7ed Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 8 Sep 2015 17:19:30 +0200
Subject: Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
---
 plugins/time/Makefile.am                           |  8 +++-----
 .../org.mate.pluma.plugins.time.gschema.xml.in     | 23 ++++++++++++++++++++++
 .../org.mate.pluma.plugins.time.gschema.xml.in.in  | 23 ----------------------
 3 files changed, 26 insertions(+), 28 deletions(-)
 create mode 100644 plugins/time/org.mate.pluma.plugins.time.gschema.xml.in
 delete mode 100644 plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in

(limited to 'plugins/time')

diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 0c270b8a..d1f8fe3b 100755
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -28,13 +28,11 @@ plugin_in_files = time.pluma-plugin.desktop.in
 plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin)
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml
+time_gschema_in = org.mate.pluma.plugins.time.gschema.xml.in
+gsettings_SCHEMAS = $(time_gschema_in:.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 = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in
+EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(time_gschema_in)
 
 CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn)
 DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
diff --git a/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in b/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in
new file mode 100644
index 00000000..b3567e96
--- /dev/null
+++ b/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <enum id="org.mate.pluma.plugins.time.PromptType">
+    <value nick="prompt-selected-format" value="0"/>
+    <value nick="prompt-custom-format" value="1"/>
+    <value nick="use-selected-format" value="2"/>
+    <value nick="use-custom-format" value="3"/>
+  </enum>
+  <schema id="org.mate.pluma.plugins.time" path="/org/mate/pluma/plugins/time/">
+    <key name="prompt-type" enum="org.mate.pluma.plugins.time.PromptType">
+      <default>'prompt-selected-format'</default>
+      <summary>Prompt type</summary>
+    </key>
+    <key name="selected-format" type="s">
+      <default>'%c'</default>
+      <summary>Selected format</summary>
+    </key>
+    <key name="custom-format" type="s">
+      <default>'%d/%m/%Y %H:%M:%S'</default>
+      <summary>Custom format</summary>
+    </key>
+  </schema>
+</schemalist>
diff --git a/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in b/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in
deleted file mode 100644
index d294cfec..00000000
--- a/plugins/time/org.mate.pluma.plugins.time.gschema.xml.in.in
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <enum id="org.mate.pluma.plugins.time.PromptType">
-    <value nick="prompt-selected-format" value="0"/>
-    <value nick="prompt-custom-format" value="1"/>
-    <value nick="use-selected-format" value="2"/>
-    <value nick="use-custom-format" value="3"/>
-  </enum>
-  <schema id="org.mate.pluma.plugins.time" path="/org/mate/pluma/plugins/time/">
-    <key name="prompt-type" enum="org.mate.pluma.plugins.time.PromptType">
-      <default>'prompt-selected-format'</default>
-      <_summary>Prompt type</_summary>
-    </key>
-    <key name="selected-format" type="s">
-      <default>'%c'</default>
-      <_summary>Selected format</_summary>
-    </key>
-    <key name="custom-format" type="s">
-      <default>'%d/%m/%Y %H:%M:%S'</default>
-      <_summary>Custom format</_summary>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1