Rework gsettings schema building

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

4 files changed, 98 insertions, 100 deletions

diff --git a/configure.ac b/configure.ac
index b998b65..9f1c250 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ dnl CXXFLAGS="-fvisibility-inlines-hidden $CXXFLAGS"
 GLIB_GSETTINGS
 
 # i18n stuff
-IT_PROG_INTLTOOL([0.41.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 GETTEXT_PACKAGE=mate-system-monitor
 AC_SUBST(GETTEXT_PACKAGE)
@@ -124,6 +124,7 @@ YELP_HELP_INIT
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+src/org.mate.system-monitor.gschema.xml
 pixmaps/Makefile
 po/Makefile.in
 help/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 938f2cf..bd462a0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,7 @@ src/load-graph.cpp
 src/lsof.cpp
 src/memmaps.cpp
 src/openfiles.cpp
-src/org.mate.system-monitor.gschema.xml.in.in
+[type: gettext/gsettings]src/org.mate.system-monitor.gschema.xml.in
 src/procactions.cpp
 src/procdialogs.cpp
 src/procman.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index f8a852f..7d40152 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,13 +64,11 @@ specdir = $(datadir)/procman
 # GSettings schemas, enum files and conversion file
 gsettings_ENUM_NAMESPACE = org.mate.system-monitor
 gsettings_ENUM_FILES = $(top_srcdir)/src/*.h
-gsettings_SCHEMAS = org.mate.system-monitor.gschema.xml
+gsettingsschema_in_files = org.mate.system-monitor.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 @INTLTOOL_XML_NOMERGE_RULE@
 
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
-	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
 convertdir = $(datadir)/MateConf/gsettings
 dist_convert_DATA = mate-system-monitor.convert
 
@@ -78,10 +76,9 @@ dist_noinst_DATA = \
 	$(gsettings_in_file)
 
 CLEANFILES = \
-	$(gsettings_SCHEMAS) \
-	$(gsettings_SCHEMAS).in
+	$(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
-	$(gsettings_SCHEMAS).in.in
+	$(gsettingsschema_in_files)
 
 MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
diff --git a/src/org.mate.system-monitor.gschema.xml.in.in b/src/org.mate.system-monitor.gschema.xml.in
index 4a3c9e9..4284f97 100644
--- a/src/org.mate.system-monitor.gschema.xml.in.in
+++ b/src/org.mate.system-monitor.gschema.xml.in
@@ -3,135 +3,135 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor" path="/org/mate/system-monitor/">
     <key name="window-state" type="(iiii)">
       <default>(700, 500, 50, 50)</default>
-      <_summary>Main window size and position in the form (width, height, xpos, ypos)</_summary>
+      <summary>Main window size and position in the form (width, height, xpos, ypos)</summary>
     </key>
     <key name="show-tree" type="b">
       <default>false</default>
-      <_summary>Show process dependencies in tree form</_summary>
+      <summary>Show process dependencies in tree form</summary>
     </key>
     <key name="solaris-mode" type="b">
       <default>false</default>
-      <_summary>Solaris mode for CPU percentage</_summary>
-      <_description>If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided by the total number of CPUs. Otherwise, it operates in 'Irix mode'.</_description>
+      <summary>Solaris mode for CPU percentage</summary>
+      <description>If TRUE, system-monitor operates in 'Solaris mode' where a task's CPU usage is divided by the total number of CPUs. Otherwise, it operates in 'Irix mode'.</description>
     </key>
     <key name="smooth-refresh" type="b">
       <default>true</default>
-      <_summary>Enable/Disable smooth refresh</_summary>
+      <summary>Enable/Disable smooth refresh</summary>
     </key>
     <key name="kill-dialog" type="b">
       <default>true</default>
-      <_summary>Show warning dialog when killing processes</_summary>
+      <summary>Show warning dialog when killing processes</summary>
     </key>
     <key name="update-interval" type="i">
       <default>3000</default>
-      <_summary>Time in milliseconds between updates of the process view</_summary>
+      <summary>Time in milliseconds between updates of the process view</summary>
     </key>
     <key name="graph-update-interval" type="i">
       <default>1000</default>
-      <_summary>Time in milliseconds between updates of the graphs</_summary>
+      <summary>Time in milliseconds between updates of the graphs</summary>
     </key>
     <key name="show-all-fs" type="b">
       <default>false</default>
-      <_summary>Whether information about all file systems should be displayed</_summary>
-      <_description>Whether to display information about all file systems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted file systems.</_description>
+      <summary>Whether information about all file systems should be displayed</summary>
+      <description>Whether to display information about all file systems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted file systems.</description>
     </key>
     <key name="disks-interval" type="i">
       <default>5000</default>
-      <_summary>Time in milliseconds between updates of the devices list</_summary>
+      <summary>Time in milliseconds between updates of the devices list</summary>
     </key>
     <key name="view-as" type="i">
       <default>1</default>
-      <_summary>Determines which processes to show by default. 0 is All, 1 is user, and 2 is active</_summary>
+      <summary>Determines which processes to show by default. 0 is All, 1 is user, and 2 is active</summary>
     </key>
     <key name="current-tab" type="i">
       <default>2</default>
-      <_summary>Saves the currently viewed tab</_summary>
-      <_description>0 for the System Info, 1 for the processes list, 2 for the resources and 3 for the disks list</_description>
+      <summary>Saves the currently viewed tab</summary>
+      <description>0 for the System Info, 1 for the processes list, 2 for the resources and 3 for the disks list</description>
     </key>
     <key name="cpu-color0" type="s">
       <default>'#FF6E00'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color1" type="s">
       <default>'#CB0C29'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color2" type="s">
       <default>'#49A835'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color3" type="s">
       <default>'#2D7DB3'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color4" type="s">
       <default>'#FF6600'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color5" type="s">
       <default>'#6600CC'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color6" type="s">
       <default>'#990000'</default>
-      <_summary>Default graph cpu color</_summary>
+      <summary>Default graph cpu color</summary>
     </key>
     <key name="cpu-color7" type="s">
       <default>'#000099'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color8" type="s">
       <default>'#FFCC00'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color9" type="s">
       <default>'#009900'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color10" type="s">
       <default>'#CC6600'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color11" type="s">
       <default>'#330099'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color12" type="s">
       <default>'#CC0066'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color13" type="s">
       <default>'#00FFCC'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color14" type="s">
       <default>'#FFCC99'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="cpu-color15" type="s">
       <default>'#339999'</default>
-      <_summary>Default graph CPU color</_summary>
+      <summary>Default graph CPU color</summary>
     </key>
     <key name="mem-color" type="s">
       <default>'#AB1852'</default>
-      <_summary>Default graph memory color</_summary>
+      <summary>Default graph memory color</summary>
     </key>
     <key name="swap-color" type="s">
       <default>'#49A835'</default>
-      <_summary>Default graph swap color</_summary>
+      <summary>Default graph swap color</summary>
     </key>
     <key name="net-in-color" type="s">
       <default>'#2D7DB3'</default>
-      <_summary>Default graph incoming network traffic color</_summary>
+      <summary>Default graph incoming network traffic color</summary>
     </key>
     <key name="net-out-color" type="s">
       <default>'#EE1D00'</default>
-      <_summary>Default graph outgoing network traffic color</_summary>
+      <summary>Default graph outgoing network traffic color</summary>
     </key>
     <key name="network-in-bits" type="b">
       <default>false
       </default>
-      <_summary>Show network traffic in bits</_summary>
+      <summary>Show network traffic in bits</summary>
     </key>
     <child name="proctree" schema="org.mate.system-monitor.proctree"/>
     <child name="disktreenew" schema="org.mate.system-monitor.disktreenew"/>
@@ -141,233 +141,233 @@
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor.proctree" path="/org/mate/system-monitor/proctree/">
     <key name="sort-col" type="i">
       <default>0</default>
-      <_summary>Process view sort column</_summary>
+      <summary>Process view sort column</summary>
     </key>
     <key name="columns-order" type="ai">
       <default>[ 0 ]</default>
-      <_summary>Process view columns order</_summary>
+      <summary>Process view columns order</summary>
     </key>
     <key name="sort-order" type="i">
       <default>0</default>
-      <_summary>Process view sort order</_summary>
+      <summary>Process view sort order</summary>
     </key>
     <key name="col-0-width" type="i">
       <default>198</default>
-      <_summary>Width of process 'name' column</_summary>
+      <summary>Width of process 'name' column</summary>
     </key>
     <key name="col-0-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'name' column on startup</_summary>
+      <summary>Show process 'name' column on startup</summary>
     </key>
     <key name="col-1-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'owner' column</_summary>
+      <summary>Width of process 'owner' column</summary>
     </key>
     <key name="col-1-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'owner' column on startup</_summary>
+      <summary>Show process 'owner' column on startup</summary>
     </key>
     <key name="col-2-width" type="i">
       <default>37</default>
-      <_summary>Width of process 'status' column</_summary>
+      <summary>Width of process 'status' column</summary>
     </key>
     <key name="col-2-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'status' column on startup</_summary>
+      <summary>Show process 'status' column on startup</summary>
     </key>
     <key name="col-3-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'virtual memory' column</_summary>
+      <summary>Width of process 'virtual memory' column</summary>
     </key>
     <key name="col-3-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'virtual memory' column on startup</_summary>
+      <summary>Show process 'virtual memory' column on startup</summary>
     </key>
     <key name="col-4-width" type="i">
       <default>53</default>
-      <_summary>Width of process 'resident memory' column</_summary>
+      <summary>Width of process 'resident memory' column</summary>
     </key>
     <key name="col-4-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'resident memory' column on startup</_summary>
+      <summary>Show process 'resident memory' column on startup</summary>
     </key>
     <key name="col-5-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'writable memory' column</_summary>
+      <summary>Width of process 'writable memory' column</summary>
     </key>
     <key name="col-5-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'writable memory' column on startup</_summary>
+      <summary>Show process 'writable memory' column on startup</summary>
     </key>
     <key name="col-6-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'shared memory' column</_summary>
+      <summary>Width of process 'shared memory' column</summary>
     </key>
     <key name="col-6-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'shared memory' column on startup</_summary>
+      <summary>Show process 'shared memory' column on startup</summary>
     </key>
     <key name="col-7-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'X server memory' column</_summary>
+      <summary>Width of process 'X server memory' column</summary>
     </key>
     <key name="col-7-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'X server memory' column on startup</_summary>
+      <summary>Show process 'X server memory' column on startup</summary>
     </key>
     <key name="col-8-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'CPU %' column</_summary>
+      <summary>Width of process 'CPU %' column</summary>
     </key>
     <key name="col-8-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'CPU %' column on startup</_summary>
+      <summary>Show process 'CPU %' column on startup</summary>
     </key>
     <key name="col-9-width" type="i">
       <default>50</default>
-      <_summary>Width of process 'CPU time' column</_summary>
+      <summary>Width of process 'CPU time' column</summary>
     </key>
     <key name="col-9-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'CPU time' column on startup</_summary>
+      <summary>Show process 'CPU time' column on startup</summary>
     </key>
     <key name="col-10-width" type="i">
       <default>0</default>
-      <_summary>Width of process 'start time' column</_summary>
+      <summary>Width of process 'start time' column</summary>
     </key>
     <key name="col-10-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'start time' column on startup</_summary>
+      <summary>Show process 'start time' column on startup</summary>
     </key>
     <key name="col-11-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'nice' column</_summary>
+      <summary>Width of process 'nice' column</summary>
     </key>
     <key name="col-11-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'nice' column on startup</_summary>
+      <summary>Show process 'nice' column on startup</summary>
     </key>
     <key name="col-12-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'PID' column</_summary>
+      <summary>Width of process 'PID' column</summary>
     </key>
     <key name="col-12-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'PID' column on startup</_summary>
+      <summary>Show process 'PID' column on startup</summary>
     </key>
     <key name="col-13-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'SELinux security context' column</_summary>
+      <summary>Width of process 'SELinux security context' column</summary>
     </key>
     <key name="col-13-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'SELinux security context' column on startup</_summary>
+      <summary>Show process 'SELinux security context' column on startup</summary>
     </key>
     <key name="col-14-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'arguments' column</_summary>
+      <summary>Width of process 'arguments' column</summary>
     </key>
     <key name="col-14-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'arguments' column on startup</_summary>
+      <summary>Show process 'arguments' column on startup</summary>
     </key>
     <key name="col-15-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'estimated memory usage' column</_summary>
+      <summary>Width of process 'estimated memory usage' column</summary>
     </key>
     <key name="col-15-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'estimated memory usage' column on startup</_summary>
+      <summary>Show process 'estimated memory usage' column on startup</summary>
     </key>
     <key name="col-16-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'Waiting Channel' column</_summary>
+      <summary>Width of process 'Waiting Channel' column</summary>
     </key>
     <key name="col-16-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'Waiting Channel' column on startup</_summary>
+      <summary>Show process 'Waiting Channel' column on startup</summary>
     </key>
     <key name="col-17-width" type="i">
       <default>48</default>
-      <_summary>Width of process 'Control Group' column</_summary>
+      <summary>Width of process 'Control Group' column</summary>
     </key>
     <key name="col-17-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'Control Group' column on startup</_summary>
+      <summary>Show process 'Control Group' column on startup</summary>
     </key>
     <key name="col-18-width" type="i">
       <default>70</default>
-      <_summary>Width of process 'Unit' column</_summary>
+      <summary>Width of process 'Unit' column</summary>
     </key>
     <key name="col-18-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'Unit' column on startup</_summary>
+      <summary>Show process 'Unit' column on startup</summary>
     </key>
     <key name="col-19-width" type="i">
       <default>41</default>
-      <_summary>Width of process 'Session' column</_summary>
+      <summary>Width of process 'Session' column</summary>
     </key>
     <key name="col-19-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'Session' column on startup</_summary>
+      <summary>Show process 'Session' column on startup</summary>
     </key>
     <key name="col-20-width" type="i">
       <default>59</default>
-      <_summary>Width of process 'Seat' column</_summary>
+      <summary>Width of process 'Seat' column</summary>
     </key>
     <key name="col-20-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'Seat' column on startup</_summary>
+      <summary>Show process 'Seat' column on startup</summary>
     </key>
     <key name="col-21-width" type="i">
       <default>59</default>
-      <_summary>Width of process 'Owner' column</_summary>
+      <summary>Width of process 'Owner' column</summary>
     </key>
     <key name="col-21-visible" type="b">
       <default>false</default>
-      <_summary>Show process 'Owner' column on startup</_summary>
+      <summary>Show process 'Owner' column on startup</summary>
     </key>
     <key name="col-22-width" type="i">
       <default>100</default>
-      <_summary>Width of process 'Priority' column</_summary>
+      <summary>Width of process 'Priority' column</summary>
     </key>
     <key name="col-22-visible" type="b">
       <default>true</default>
-      <_summary>Show process 'Priority' column on startup</_summary>
+      <summary>Show process 'Priority' column on startup</summary>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor.disktreenew" path="/org/mate/system-monitor/disktreenew/">
     <key name="sort-col" type="i">
       <default>1</default>
-      <_summary>Disk view sort colum</_summary>
+      <summary>Disk view sort colum</summary>
     </key>
     <key name="sort-order" type="i">
       <default>0</default>
-      <_summary>Disk view sort order</_summary>
+      <summary>Disk view sort order</summary>
     </key>
     <key name="columns-order" type="ai">
       <default>[ 0 ]</default>
-      <_summary>Disk view columns order</_summary>
+      <summary>Disk view columns order</summary>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor.memmapstree" path="/org/mate/system-monitor/memmapstree/">
     <key name="sort-col" type="i">
       <default>0</default>
-      <_summary>Memory map sort column</_summary>
+      <summary>Memory map sort column</summary>
     </key>
     <key name="sort-order" type="i">
       <default>0</default>
-      <_summary>Memory map sort order</_summary>
+      <summary>Memory map sort order</summary>
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor.openfilestree" path="/org/mate/system-monitor/openfilestree/">
     <key name="sort-col" type="i">
       <default>0</default>
-      <_summary>Open files sort column</_summary>
+      <summary>Open files sort column</summary>
     </key>
     <key name="sort-order" type="i">
       <default>0</default>
-      <_summary>Open files sort order</_summary>
+      <summary>Open files sort order</summary>
     </key>
   </schema>
 </schemalist>