Rework gsettings schema building

* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files

5 files changed, 54 insertions, 56 deletions

diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index d7cba006..db61f873 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -84,21 +84,19 @@ xmlui_DATA  = \
 	showdesktop-menu.xml \
 	window-list-menu.xml
 
-gsettings_SCHEMAS = \
-	org.mate.panel.applet.window-list.gschema.xml \
-	org.mate.panel.applet.workspace-switcher.gschema.xml
+wncklet_gschemas_in = \
+	org.mate.panel.applet.window-list.gschema.xml.in \
+	org.mate.panel.applet.workspace-switcher.gschema.xml.in
+gsettings_SCHEMAS = $(wncklet_gschemas_in:.xml.in=.xml)
+
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 EXTRA_DIST = \
 	org.mate.panel.Wncklet.mate-panel-applet.in.in \
 	$(service_in_files) \
 	$(xmlui_DATA) \
-	org.mate.panel.applet.window-list.gschema.xml.in.in \
-	org.mate.panel.applet.workspace-switcher.gschema.xml.in.in \
+	$(wncklet_gschemas_in) \
 	$(ui_DATA)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
new file mode 100644
index 00000000..0f2d871d
--- /dev/null
+++ b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <enum id="org.mate.panel.applet.window-list.GroupingType">
+    <value nick="never" value="0"/>
+    <value nick="auto" value="1"/>
+    <value nick="always" value="2"/>
+  </enum>
+  <schema id="org.mate.panel.applet.window-list">
+    <key name="display-all-workspaces" type="b">
+      <default>false</default>
+      <summary>Show windows from all workspaces</summary>
+      <description>If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace.</description>
+    </key>
+    <key name="group-windows" enum="org.mate.panel.applet.window-list.GroupingType">
+      <default>'never'</default>
+      <summary>When to group windows</summary>
+      <description>Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always".</description>
+    </key>
+    <key name="move-unminimized-windows" type="b">
+      <default>true</default>
+      <summary>Move windows to current workspace when unminimized</summary>
+      <description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in
deleted file mode 100644
index a9647379..00000000
--- a/applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <enum id="org.mate.panel.applet.window-list.GroupingType">
-    <value nick="never" value="0"/>
-    <value nick="auto" value="1"/>
-    <value nick="always" value="2"/>
-  </enum>
-  <schema id="org.mate.panel.applet.window-list">
-    <key name="display-all-workspaces" type="b">
-      <default>false</default>
-      <_summary>Show windows from all workspaces</_summary>
-      <_description>If true, the window list will show windows from all workspaces. Otherwise it will only display windows from the current workspace.</_description>
-    </key>
-    <key name="group-windows" enum="org.mate.panel.applet.window-list.GroupingType">
-      <default>'never'</default>
-      <_summary>When to group windows</_summary>
-      <_description>Decides when to group windows from the same application on the window list. Possible values are "never", "auto" and "always".</_description>
-    </key>
-    <key name="move-unminimized-windows" type="b">
-      <default>true</default>
-      <_summary>Move windows to current workspace when unminimized</_summary>
-      <_description>If true, then when unminimizing a window, move it to the current workspace. Otherwise, switch to the workspace of the window.</_description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
new file mode 100644
index 00000000..c49f472d
--- /dev/null
+++ b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+  <schema id="org.mate.panel.applet.workspace-switcher">
+    <key name="display-workspace-names" type="b">
+      <default>false</default>
+      <summary>Display workspace names</summary>
+      <description>If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco.</description>
+    </key>
+    <key name="display-all-workspaces" type="b">
+      <default>true</default>
+      <summary>Display all workspaces</summary>
+      <description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace.</description>
+    </key>
+    <key name="num-rows" type="i">
+      <default>1</default>
+      <summary>Rows in workspace switcher</summary>
+      <description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true.</description>
+    </key>
+    <key name="wrap-workspaces" type="b">
+      <default>false</default>
+      <summary>Wrap around on scroll</summary>
+      <description>If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in b/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in
deleted file mode 100644
index 82a20922..00000000
--- a/applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
-  <schema id="org.mate.panel.applet.workspace-switcher">
-    <key name="display-workspace-names" type="b">
-      <default>false</default>
-      <_summary>Display workspace names</_summary>
-      <_description>If true, the workspaces in the workspace switcher will display the names of the workspaces. Otherwise they will display the windows on the workspace. This setting only works when the window manager is Marco.</_description>
-    </key>
-    <key name="display-all-workspaces" type="b">
-      <default>true</default>
-      <_summary>Display all workspaces</_summary>
-      <_description>If true, the workspace switcher will show all workspaces. Otherwise it will only show the current workspace.</_description>
-    </key>
-    <key name="num-rows" type="i">
-      <default>1</default>
-      <_summary>Rows in workspace switcher</_summary>
-      <_description>This key specifies how many rows (for horizontal layout) or columns (for vertical layout) the workspace switcher shows the workspaces in. This key is only relevant if the display_all_workspaces key is true.</_description>
-    </key>
-    <key name="wrap-workspaces" type="b">
-      <default>false</default>
-      <_summary>Wrap around on scroll</_summary>
-      <_description>If true, the workspace switcher will allow wrap-around, which means switching from the first to the last workspace and vice versa via scrolling.</_description>
-    </key>
-  </schema>
-</schemalist>