From ddf66032a7375c70befe4a0d72ba04d7bc6b0f15 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 8 Sep 2015 12:39:43 +0200
Subject: Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
---
 mate-window-picker-applet/Makefile.am                         | 11 ++++-------
 ...mate.panel.applet.mate-window-picker-applet.gschema.xml.in |  9 +++++++++
 ...e.panel.applet.mate-window-picker-applet.gschema.xml.in.in |  9 ---------
 3 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
 delete mode 100644 mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in

(limited to 'mate-window-picker-applet')

diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am
index 0ecd7b4..71bfd50 100644
--- a/mate-window-picker-applet/Makefile.am
+++ b/mate-window-picker-applet/Makefile.am
@@ -47,14 +47,11 @@ org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files)
 	$< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = org.mate.panel.applet.mate-window-picker-applet.gschema.xml
+gsettingsschema_in_files = org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
 
-gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.in)
+gsettings_SCHEMAS = $(gsettingsschema_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' < $< > $@
-
 xmluidir = $(datadir)/mate-panel/ui
 xmlui_DATA = mate-window-picker-applet-menu.xml
 
@@ -63,14 +60,14 @@ EXTRA_DIST = \
 	$(service_in_files) \
 	$(ui_DATA) \
 	$(convert_DATA) \
-	$(gsettings_SCHEMAS_in_in) \
+	$(gsettingsschema_in_files) \
 	$(xmlui_DATA)
 
 CLEANFILES = \
 	$(applet_DATA) \
 	$(applet_DATA).in \
-	$(gsettings_SCHEMAS_in) \
 	$(gsettings_SCHEMAS) \
+	*.gschema.valid \
 	$(service_DATA)
 
 clean:
diff --git a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
new file mode 100644
index 0000000..71f3bd2
--- /dev/null
+++ b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.mate-window-picker-applet">
+    <key name="show-all-windows" type="b">
+      <default>true</default>
+      <summary>Show windows from all workspaces.</summary>
+      <description>Show windows from all workspaces.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in b/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in
deleted file mode 100644
index 88964f1..0000000
--- a/mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.mate-window-picker-applet">
-    <key name="show-all-windows" type="b">
-      <default>true</default>
-      <_summary>Show windows from all workspaces.</_summary>
-      <_description>Show windows from all workspaces.</_description>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1