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, 35 insertions, 39 deletions

diff --git a/Makefile.am b/Makefile.am
index 7949bdf..dd042b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,29 +26,23 @@ org.mate.panel.applet.SensorsAppletFactory.service: $(service_in_files)
 		$< > $@
 
 @INTLTOOL_XML_NOMERGE_RULE@
-gsettings_SCHEMAS = \
-	org.mate.sensors-applet.gschema.xml \
-	org.mate.sensors-applet.sensor.gschema.xml
+gsettingsschema_in_files = \
+	org.mate.sensors-applet.gschema.xml.in \
+	org.mate.sensors-applet.sensor.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' \
-		< $< > $@
-
 CLEANFILES = $(applet_DATA) \
 	$(applet_DATA).in \
 	$(service_DATA) \
-	$(gsettings_SCHEMAS_in) \
 	$(gsettings_SCHEMAS) \
 	*.gschema.valid
 
 EXTRA_DIST = $(ui_DATA) \
 	$(applet_in_files).in \
 	$(service_in_files) \
-	$(gsettings_SCHEMAS_in_in) \
+	$(gsettingsschema_in_files) \
 	autogen.sh
 
 DISTCLEANFILES	= intltool-extract \
diff --git a/configure.ac b/configure.ac
index 377e38f..665d13b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ GETTEXT_PACKAGE=mate-sensors-applet
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL
+IT_PROG_INTLTOOL([0.50.1])
 
 # ========== export compiler / linker options ======== #
 AC_SUBST(CFLAGS)
@@ -280,6 +280,8 @@ AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
 # ================= generate files =================== #
 AC_CONFIG_FILES([
 	Makefile
+	org.mate.sensors-applet.gschema.xml
+	org.mate.sensors-applet.sensor.gschema.xml
 	sensors-applet/Makefile
 	lib/Makefile
 	plugins/Makefile
diff --git a/org.mate.sensors-applet.gschema.xml.in.in b/org.mate.sensors-applet.gschema.xml.in
index bd905ad..0292c00 100644
--- a/org.mate.sensors-applet.gschema.xml.in.in
+++ b/org.mate.sensors-applet.gschema.xml.in
@@ -2,39 +2,39 @@
   <schema id="org.mate.sensors-applet">
     <key name="font-size" type="i">
       <default>0</default>
-      <_summary>Font size in points</_summary>
+      <summary>Font size in points</summary>
     </key>
     <key name="hide-units" type="b">
       <default>false</default>
-      <_summary>Specify if show or hide sensor units</_summary>
+      <summary>Specify if show or hide sensor units</summary>
     </key>
     <key name="display-mode" type="i">
       <default>1</default>
-      <_summary>Set if display icons or text labels</_summary>
+      <summary>Set if display icons or text labels</summary>
     </key>
     <key name="layout-mode" type="i">
       <default>0</default>
-      <_summary>Set value beside or below label</_summary>
+      <summary>Set value beside or below label</summary>
     </key>
     <key name="temperature-scale" type="i">
       <default>1</default>
-      <_summary>Show temperature in Kelvin, Celsius or Fahrenheit </_summary>
+      <summary>Show temperature in Kelvin, Celsius or Fahrenheit </summary>
     </key>
     <key name="display-notifications" type="b">
       <default>true</default>
-      <_summary>Whether to display notifications</_summary>
+      <summary>Whether to display notifications</summary>
     </key>
     <key name="timeout-delay" type="i">
       <default>2000</default>
-      <_summary>Delay (in ms) between refreshes</_summary>
+      <summary>Delay (in ms) between refreshes</summary>
     </key>
     <key name="graph-size" type="i">
       <default>42</default>
-      <_summary>The size of the graph in pixels (width if horizontal, height if vertical)</_summary>
+      <summary>The size of the graph in pixels (width if horizontal, height if vertical)</summary>
     </key>
     <key name="sensors-list" type="as">
       <default>[]</default>
-      <_summary>List of sensors</_summary>
+      <summary>List of sensors</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/org.mate.sensors-applet.sensor.gschema.xml.in.in b/org.mate.sensors-applet.sensor.gschema.xml.in
index dc8bb8b..abc1367 100644
--- a/org.mate.sensors-applet.sensor.gschema.xml.in.in
+++ b/org.mate.sensors-applet.sensor.gschema.xml.in
@@ -2,67 +2,67 @@
   <schema id="org.mate.sensors-applet.sensor">
     <key name="path" type="s">
       <default>''</default>
-      <_summary>Path to filename</_summary>
+      <summary>Path to filename</summary>
     </key>
     <key name="id" type="s">
       <default>''</default>
-      <_summary>Sensor device ids</_summary>
+      <summary>Sensor device ids</summary>
     </key>
     <key name="interface" type="s">
       <default>''</default>
-      <_summary>The sensor device interface</_summary>
+      <summary>The sensor device interface</summary>
     </key>
     <key name="label" type="s">
       <default>''</default>
-      <_summary>User defined label</_summary>
+      <summary>User defined label</summary>
     </key>
     <key name="enabled" type="b">
       <default>true</default>
-      <_summary>Whether a sensor is enabled or not</_summary>
+      <summary>Whether a sensor is enabled or not</summary>
     </key>
     <key name="low-value" type="d">
       <default>0</default>
-      <_summary>Low value</_summary>
+      <summary>Low value</summary>
     </key>
     <key name="high-value" type="d">
       <default>0</default>
-      <_summary>High value</_summary>
+      <summary>High value</summary>
     </key>
     <key name="alarm-enabled" type="b">
       <default>false</default>
-      <_summary>Whether the sensor has its alarm enabled</_summary>
+      <summary>Whether the sensor has its alarm enabled</summary>
     </key>
     <key name="low-alarm-command" type="s">
       <default>''</default>
-      <_summary>Command to execute when the alarm is activated</_summary>
+      <summary>Command to execute when the alarm is activated</summary>
     </key>
     <key name="high-alarm-command" type="s">
       <default>''</default>
-      <_summary>Command to execute when the alarm is activated</_summary>
+      <summary>Command to execute when the alarm is activated</summary>
     </key>
     <key name="alarm-timeout" type="i">
       <default>0</default>
-      <_summary>How often each alarm should be sounded (in seconds)</_summary>
+      <summary>How often each alarm should be sounded (in seconds)</summary>
     </key>
     <key name="sensor-type" type="i">
       <default>0</default>
-      <_summary>Used to identify a sensor in a list</_summary>
+      <summary>Used to identify a sensor in a list</summary>
     </key>
     <key name="multiplier" type="d">
       <default>1</default>
-      <_summary>Multiplier</_summary>
+      <summary>Multiplier</summary>
     </key>
     <key name="offset" type="d">
       <default>0</default>
-      <_summary>Offset</_summary>
+      <summary>Offset</summary>
     </key>
     <key name="icon-type" type="i">
       <default>0</default>
-      <_summary>Icon type</_summary>
+      <summary>Icon type</summary>
     </key>
     <key name="graph-color" type="s">
       <default>'#ff0000'</default>
-      <_summary>Color of the graph for the sensor</_summary>
+      <summary>Color of the graph for the sensor</summary>
     </key>
   </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 36556b2..c15ada3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 org.mate.applets.sensors-applet.mate-panel-applet.in.in
-org.mate.sensors-applet.gschema.xml.in.in
-org.mate.sensors-applet.sensor.gschema.xml.in.in
+[type: gettext/gsettings]org.mate.sensors-applet.gschema.xml.in
+[type: gettext/gsettings]org.mate.sensors-applet.sensor.gschema.xml.in
 plugins/pmu-sys/pmu-sys-plugin.c
 plugins/i2c-sys/i2c-sys-plugin.c
 plugins/i8k/i8k-plugin.c