fix schema installation

4 files changed, 16 insertions, 786 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 6d982b0..69535c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,13 +49,14 @@ specdir = $(datadir)/procman
 
 
 # GSettings schemas, enum files and conversion file
-gsettings_ENUM_NAMESPACE = org.mate.mate-system-monitor
+gsettings_ENUM_NAMESPACE = org.mate.system-monitor
 gsettings_ENUM_FILES = $(top_srcdir)/src/*.h
-gsettingsschemadir = $(datadir)/glib-2.0/schemas
-gsettings_in_file = org.mate.mate-system-monitor.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.mate.system-monitor.gschema.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' < $< > $@
 
 dist_noinst_DATA = \
     $(gsettings_in_file)
diff --git a/src/mate-system-monitor.schemas.in b/src/mate-system-monitor.schemas.in
deleted file mode 100644
index 7c75751..0000000
--- a/src/mate-system-monitor.schemas.in
+++ /dev/null
@@ -1,771 +0,0 @@
-<mateconfschemafile>
-
-  <schemalist>
-      <schema>
-      <key>/schemas/apps/procman/width</key>
-      <applyto>/apps/procman/width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>440</default>
-      <locale name="C">
-        <short>Main Window width</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/height</key>
-      <applyto>/apps/procman/height</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>495</default>
-      <locale name="C">
-        <short>Main Window height</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/show_tree</key>
-      <applyto>/apps/procman/show_tree</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process dependencies in tree form</short>
-        <long></long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/procman/solaris_mode</key>
-      <applyto>/apps/procman/solaris_mode</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Solaris mode for CPU percentage</short>
-        <long>If TRUE, system-monitor operates in 'Solaris mode' where a task's cpu usage is divided by the total number of CPUs. Else it operates in 'Irix mode'.</long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/smooth_refresh</key>
-      <applyto>/apps/procman/smooth_refresh</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Enable/Disable smooth refresh</short>
-        <long></long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/procman/kill_dialog</key>
-      <applyto>/apps/procman/kill_dialog</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show warning dialog when killing processes</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/update_interval</key>
-      <applyto>/apps/procman/update_interval</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>3000</default>
-      <locale name="C">
-        <short>Time in milliseconds between updates of the process view</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/graph_update_interval</key>
-      <applyto>/apps/procman/graph_update_interval</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>1000</default>
-      <locale name="C">
-        <short>Time in milliseconds between updates of the graphs</short>
-        <long></long>
-      </locale>
-      </schema>
-  
-      <schema>
-      <key>/schemas/apps/procman/show_all_fs</key>
-      <applyto>/apps/procman/show_all_fs</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>False</default>
-      <locale name="C">
-        <short>Whether information about all filesystems should be displayed</short>
-        <long>Whether to display information about all filesystems (including types like 'autofs' and 'procfs'). Useful for getting a list of all currently mounted filesystems.</long>
-      </locale>
-      </schema>
-
-    
-      <schema>
-      <key>/schemas/apps/procman/disks_interval</key>
-      <applyto>/apps/procman/disks_interval</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>5000</default>
-      <locale name="C">
-        <short>Time in milliseconds between updates of the devices list</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/view_as</key>
-      <applyto>/apps/procman/view_as</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Determines which processes to show by default. 0 is All, 1 is user, and 2 is active</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/current_tab</key>
-      <applyto>/apps/procman/current_tab</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>2</default>
-      <locale name="C">
-        <short>Saves the currently viewed tab</short>
-        <long>0 for the System Info, 1 for the processes list, 2 for the resources and 3 for the disks list</long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/cpu_color0</key>
-      <applyto>/apps/procman/cpu_color0</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#FF6E00</default>
-      <locale name="C">
-        <short>Default graph cpu color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/cpu_color1</key>
-      <applyto>/apps/procman/cpu_color1</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#CB0C29</default>
-      <locale name="C">
-        <short>Default graph cpu color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/cpu_color2</key>
-      <applyto>/apps/procman/cpu_color2</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#49A835</default>
-      <locale name="C">
-        <short>Default graph cpu color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/cpu_color3</key>
-      <applyto>/apps/procman/cpu_color3</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#2D7DB3</default>
-      <locale name="C">
-        <short>Default graph cpu color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/mem_color</key>
-      <applyto>/apps/procman/mem_color</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#AB1852</default>
-      <locale name="C">
-        <short>Default graph mem color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/swap_color</key>
-      <applyto>/apps/procman/swap_color</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#49A835</default>
-      <locale name="C">
-        <short>Default graph swap color</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/net_in_color</key>
-      <applyto>/apps/procman/net_in_color</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#2D7DB3</default>
-      <locale name="C">
-        <short>Default graph incoming network traffic color</short>
-        <long></long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/procman/net_out_color</key>
-      <applyto>/apps/procman/net_out_color</applyto>
-      <owner>procman</owner>
-      <type>string</type>
-      <default>#844798</default>
-      <locale name="C">
-        <short>Default graph outgoing network traffic color</short>
-        <long></long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/sort_col</key>
-      <applyto>/apps/procman/proctree/sort_col</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Process view sort column</short>
-        <long></long>
-      </locale>
-      </schema>
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/columns_order</key>
-      <applyto>/apps/procman/proctree/columns_order</applyto>
-      <owner>procman</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <default>[0]</default>
-      <locale name="C">
-        <short>Process view columns order</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/sort_order</key>
-      <applyto>/apps/procman/proctree/sort_order</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Process view sort order</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_0_width</key>
-      <applyto>/apps/procman/proctree/col_0_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>198</default>
-      <locale name="C">
-        <short>Width of process 'name' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_0_visible</key>
-      <applyto>/apps/procman/proctree/col_0_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'name' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_1_width</key>
-      <applyto>/apps/procman/proctree/col_1_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'owner' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_1_visible</key>
-      <applyto>/apps/procman/proctree/col_1_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'owner' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_2_width</key>
-      <applyto>/apps/procman/proctree/col_2_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>37</default>
-      <locale name="C">
-        <short>Width of process 'status' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_2_visible</key>
-      <applyto>/apps/procman/proctree/col_2_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'status' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_3_width</key>
-      <applyto>/apps/procman/proctree/col_3_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'virtual memory' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_3_visible</key>
-      <applyto>/apps/procman/proctree/col_3_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'virtual memory' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_4_width</key>
-      <applyto>/apps/procman/proctree/col_4_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>53</default>
-      <locale name="C">
-        <short>Width of process 'resident memory' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_4_visible</key>
-      <applyto>/apps/procman/proctree/col_4_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'resident memory' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_5_width</key>
-      <applyto>/apps/procman/proctree/col_5_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'writable memory' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_5_visible</key>
-      <applyto>/apps/procman/proctree/col_5_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'writable memory' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_6_width</key>
-      <applyto>/apps/procman/proctree/col_6_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'shared memory' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_6_visible</key>
-      <applyto>/apps/procman/proctree/col_6_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'shared memory' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_7_width</key>
-      <applyto>/apps/procman/proctree/col_7_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'X server memory' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_7_visible</key>
-      <applyto>/apps/procman/proctree/col_7_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'X server memory' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_8_width</key>
-      <applyto>/apps/procman/proctree/col_8_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'CPU %' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_8_visible</key>
-      <applyto>/apps/procman/proctree/col_8_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'CPU %' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_9_width</key>
-      <applyto>/apps/procman/proctree/col_9_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>50</default>
-      <locale name="C">
-        <short>Width of process 'CPU time' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_9_visible</key>
-      <applyto>/apps/procman/proctree/col_9_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'CPU time' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_10_width</key>
-      <applyto>/apps/procman/proctree/col_10_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Width of process 'start time' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_10_visible</key>
-      <applyto>/apps/procman/proctree/col_10_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'start time' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_11_width</key>
-      <applyto>/apps/procman/proctree/col_11_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'nice' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_11_visible</key>
-      <applyto>/apps/procman/proctree/col_11_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'nice' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_12_width</key>
-      <applyto>/apps/procman/proctree/col_12_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'PID' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_12_visible</key>
-      <applyto>/apps/procman/proctree/col_12_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'PID' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_13_width</key>
-      <applyto>/apps/procman/proctree/col_13_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'SELinux security context' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_13_visible</key>
-      <applyto>/apps/procman/proctree/col_13_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'SELinux security context' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_14_width</key>
-      <applyto>/apps/procman/proctree/col_14_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'arguments' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_14_visible</key>
-      <applyto>/apps/procman/proctree/col_14_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-        <short>Show process 'arguments' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_15_width</key>
-      <applyto>/apps/procman/proctree/col_15_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'estimated memory usage' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_15_visible</key>
-      <applyto>/apps/procman/proctree/col_15_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'estimated memory usage' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_16_width</key>
-      <applyto>/apps/procman/proctree/col_16_width</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>48</default>
-      <locale name="C">
-        <short>Width of process 'Waiting Channel' column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/proctree/col_16_visible</key>
-      <applyto>/apps/procman/proctree/col_16_visible</applyto>
-      <owner>procman</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Show process 'Waiting Channel' column on startup</short>
-        <long></long>
-      </locale>
-      </schema>
-
-
-      <schema>
-      <key>/schemas/apps/procman/disktreenew/sort_col</key>
-      <applyto>/apps/procman/disktreenew/sort_col</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Process view sort column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/disktreenew/sort_order</key>
-      <applyto>/apps/procman/disktreenew/sort_order</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Process view sort order</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/disktreenew/columns_order</key>
-      <applyto>/apps/procman/disktreenew/columns_order</applyto>
-      <owner>procman</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <default>[0]</default>
-      <locale name="C">
-        <short>Disk view columns order</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/memmapstree/sort_col</key>
-      <applyto>/apps/procman/memmapstree/sort_col</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Process view sort column</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-      <schema>
-      <key>/schemas/apps/procman/memmapstree/sort_order</key>
-      <applyto>/apps/procman/memmapstree/sort_order</applyto>
-      <owner>procman</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Process view sort order</short>
-        <long></long>
-      </locale>
-      </schema>
-      
-  </schemalist>
-  
-</mateconfschemafile>
diff --git a/src/org.mate.mate-system-monitor.gschema.xml.in b/src/org.mate.system-monitor.gschema.xml.in.in
index 5edbb85..92c3c8a 100644
--- a/src/org.mate.mate-system-monitor.gschema.xml.in
+++ b/src/org.mate.system-monitor.gschema.xml.in.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.mate-system-monitor" path="/org/mate/mate-system-monitor/">
+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.system-monitor" path="/org/mate/system-monitor/">
     <key name="width" type="i">
       <default>440</default>
       <summary>Main Window width</summary>
@@ -90,12 +90,12 @@
       <_summary>Show network traffic in bits
       </_summary>
     </key>
-    <child name="proctree" schema="org.mate.mate-system-monitor.proctree"/>
-    <child name="disktreenew" schema="org.mate.mate-system-monitor.disktreenew"/>
-    <child name="memmapstree" schema="org.mate.mate-system-monitor.memmapstree"/>
-    <child name="openfilestree" schema="org.mate.mate-system-monitor.openfilestree" />
+    <child name="proctree" schema="org.mate.system-monitor.proctree"/>
+    <child name="disktreenew" schema="org.mate.system-monitor.disktreenew"/>
+    <child name="memmapstree" schema="org.mate.system-monitor.memmapstree"/>
+    <child name="openfilestree" schema="org.mate.system-monitor.openfilestree" />
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.mate-system-monitor.proctree" path="/org/mate/mate-system-monitor/proctree/">
+  <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>
@@ -245,7 +245,7 @@
       <summary>Show process 'Waiting Channel' column on startup</summary>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.mate-system-monitor.disktreenew" path="/org/mate/mate-system-monitor/disktreenew/">
+  <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>Process view sort column</summary>
@@ -259,7 +259,7 @@
       <summary>Disk view columns order</summary>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.mate-system-monitor.memmapstree" path="/org/mate/mate-system-monitor/memmapstree/">
+  <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>Process view sort column</summary>
@@ -269,7 +269,7 @@
       <summary>Process view sort order</summary>
     </key>
   </schema>
-  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.mate-system-monitor.openfilestree" path="/org/mate/mate-system-monitor/openfilestree/">
+  <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>Process view sort column</_summary>
diff --git a/src/procman.h b/src/procman.h
index c44087a..c71cff2 100644
--- a/src/procman.h
+++ b/src/procman.h
@@ -40,7 +40,7 @@ struct LoadGraph;
 #include "smooth_refresh.h"
 #include "prettytable.h"
 
-#define GSM_GSETTINGS_SCHEMA "org.mate.mate-system-monitor"
+#define GSM_GSETTINGS_SCHEMA "org.mate.system-monitor"
 
 enum
 {