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
---
 charpick/Makefile.am                                      | 10 ++++------
 charpick/org.mate.panel.applet.charpick.gschema.xml.in    | 14 ++++++++++++++
 charpick/org.mate.panel.applet.charpick.gschema.xml.in.in | 14 --------------
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 charpick/org.mate.panel.applet.charpick.gschema.xml.in
 delete mode 100644 charpick/org.mate.panel.applet.charpick.gschema.xml.in.in

(limited to 'charpick')

diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index b58c4c98..d1c6abda 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -41,21 +41,19 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files)
             $< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml
+charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in
+gsettings_SCHEMAS = $(charpick_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' < $< > $@
-
 uidir = $(datadir)/mate/ui
 ui_DATA = charpick-applet-menu.xml
 
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
 
 EXTRA_DIST =							\
 	org.mate.applets.CharpickerApplet.mate-panel-applet.in.in	\
 	$(service_in_files)					\
 	$(ui_DATA)						\
-	$(gsettings_SCHEMAS).in.in
+	$(charpick_gschema_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in
new file mode 100644
index 00000000..9e4971c7
--- /dev/null
+++ b/charpick/org.mate.panel.applet.charpick.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.charpick">
+    <key name="current-list" type="s">
+      <default>''</default>
+      <summary>Characters shown on applet startup</summary>
+      <description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</description>
+    </key>
+    <key name="chartable" type="as">
+      <default>[]</default>
+      <summary>List of available palettes</summary>
+      <description>List of strings containing the available palettes.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in
deleted file mode 100644
index 555cc4b6..00000000
--- a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.charpick">
-    <key name="current-list" type="s">
-      <default>''</default>
-      <_summary>Characters shown on applet startup</_summary>
-      <_description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</_description>
-    </key>
-    <key name="chartable" type="as">
-      <default>[]</default>
-      <_summary>List of available palettes</_summary>
-      <_description>List of strings containing the available palettes.</_description>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1