Port to Gsettings based on GNOME patch by Richard Hughes

3 files changed, 344 insertions, 762 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 80b8a49..0f0d775 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS = icons
 
-@INTLTOOL_SCHEMAS_RULE@
-schemadir = $(sysconfdir)/mateconf/schemas
-schema_in_files = mate-power-manager.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(datadir)/applications
@@ -23,6 +19,9 @@ service_DATA     = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\@servicedir\@|$(bindir)|" $< > $@
 
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = org.mate.power-manager.gschema.xml
+
 pkgdata_DATA =						\
 	gpm-statistics.ui				\
 	gpm-statistics-deprecated.ui	\
@@ -32,25 +31,12 @@ pkgdata_DATA =						\
 	acme.ui
 
 EXTRA_DIST =						\
-	mate-power-manager.schemas.in			\
-	$(schema_in_files)				\
-	$(desktop_in_files)				\
-	$(autostart_in_files)				\
+	$(gsettings_SCHEMAS)				\
 	$(service_in_files)				\
+	$(autostart_in_files)				\
+	$(desktop_in_files)				\
 	$(pkgdata_DATA)
 
-if MATECONF_SCHEMAS_INSTALL
-install-data-local:
-	-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
-	$(MATECONFTOOL) --makefile-install-rule $(schema_DATA)
-endif
-
-if MATECONF_SCHEMAS_INSTALL
-uninstall-local:
-	-MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \
-	$(MATECONFTOOL) --makefile-uninstall-rule $(schema_DATA)
-endif
-
 clean-local :
 	rm -f *~
 
@@ -58,5 +44,4 @@ DISTCLEANFILES =					\
 	mate-power-manager.desktop			\
 	mate-power-preferences.desktop			\
 	mate-power-statistics.desktop			\
-	mate-power-manager.schemas			\
 	mate-power-manager.service
diff --git a/data/mate-power-manager.schemas.in b/data/mate-power-manager.schemas.in
deleted file mode 100644
index 4845738..0000000
--- a/data/mate-power-manager.schemas.in
+++ /dev/null
@@ -1,741 +0,0 @@
-<mateconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/sleep_type_battery</key>
-      <applyto>/apps/mate-power-manager/actions/sleep_type_battery</applyto>
-      <type>string</type>
-      <default>hibernate</default>
-      <locale name="C">
-        <short>Whether to hibernate, suspend or do nothing when inactive</short>
-        <long>The type of sleeping that should be performed when the computer is inactive. Possible values are "hibernate", "suspend" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/critical_battery</key>
-      <applyto>/apps/mate-power-manager/actions/critical_battery</applyto>
-      <type>string</type>
-      <default>hibernate</default>
-      <locale name="C">
-        <short>Battery critical low action</short>
-        <long>The action to take when the battery is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/event_when_closed_battery</key>
-      <applyto>/apps/mate-power-manager/actions/event_when_closed_battery</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If the battery event should occur when the lid is shut and the power disconnected</short>
-        <long>If the battery lid close event should occur (for example 'Suspend when lid closed on battery') when the lid is previously shut and the AC power disconnected at a later time.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/sleep_type_ac</key>
-      <applyto>/apps/mate-power-manager/actions/sleep_type_ac</applyto>
-      <type>string</type>
-      <default>suspend</default>
-      <locale name="C">
-        <short>Whether to hibernate, suspend or do nothing when inactive</short>
-        <long>The type of sleeping that should be performed when the computer is inactive. Possible values are "hibernate", "suspend" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/critical_ups</key>
-      <applyto>/apps/mate-power-manager/actions/critical_ups</applyto>
-      <type>string</type>
-      <default>shutdown</default>
-      <locale name="C">
-        <short>UPS critical low action</short>
-        <long>The action to take when the UPS is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/actions/low_ups</key>
-      <applyto>/apps/mate-power-manager/actions/low_ups</applyto>
-      <type>string</type>
-      <default>hibernate</default>
-      <locale name="C">
-        <short>UPS low power action</short>
-        <long>The action to take when the UPS is low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/enable</key>
-      <applyto>/apps/mate-power-manager/backlight/enable</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Allow backlight brightness adjustment</short>
-        <long>If the screen brightness should be changed when switching between AC and battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/battery_reduce</key>
-      <applyto>/apps/mate-power-manager/backlight/battery_reduce</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Reduce the backlight brightness when on battery power</short>
-        <long>If the screen should be reduced in brightness when the computer is on battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/idle_brightness</key>
-      <applyto>/apps/mate-power-manager/backlight/idle_brightness</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>30</default>
-      <locale name="C">
-        <short>The brightness of the screen when idle</short>
-        <long>This is the laptop panel screen brightness used when the session is idle. Only valid when use_time_for_policy is true.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/idle_dim_battery</key>
-      <applyto>/apps/mate-power-manager/backlight/idle_dim_battery</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Dim the screen after a period of inactivity when on battery power</short>
-        <long>If the screen should be dimmed to save power when the computer is idle when on battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/idle_dim_time</key>
-      <applyto>/apps/mate-power-manager/backlight/idle_dim_time</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>10</default>
-      <locale name="C">
-        <short>The default amount of time to dim the screen after idle</short>
-        <long>The default amount of time to dim the screen after idle.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/brightness_dim_battery</key>
-      <applyto>/apps/mate-power-manager/backlight/brightness_dim_battery</applyto>
-      <type>int</type>
-      <default>50</default>
-      <locale name="C">
-        <short>LCD dimming amount when on battery</short>
-        <long>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/idle_dim_ac</key>
-      <applyto>/apps/mate-power-manager/backlight/idle_dim_ac</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Dim the screen after a period of inactivity when on AC power</short>
-        <long>If the screen should be dimmed to save power when the computer is idle when on AC power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/dpms_method_ac</key>
-      <applyto>/apps/mate-power-manager/backlight/dpms_method_ac</applyto>
-      <type>string</type>
-      <default>off</default>
-      <locale name="C">
-        <short>Method used to blank screen on AC</short>
-        <long>The DPMS method used to blank the screen when on AC power. Possible values are "standby", "suspend" and "off".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/dpms_method_battery</key>
-      <applyto>/apps/mate-power-manager/backlight/dpms_method_battery</applyto>
-      <type>string</type>
-      <default>off</default>
-      <locale name="C">
-        <short>Method used to blank screen on battery</short>
-        <long>The DPMS method used to blank the screen when on battery power. Possible values are "standby", "suspend" and "off".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/backlight/brightness_ac</key>
-      <applyto>/apps/mate-power-manager/backlight/brightness_ac</applyto>
-      <type>int</type>
-      <default>100</default>
-      <locale name="C">
-        <short>LCD brightness when on AC</short>
-        <long>The brightness of the display when on AC power. Possible values are between 0 and 100.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/buttons/suspend</key>
-      <applyto>/apps/mate-power-manager/buttons/suspend</applyto>
-      <type>string</type>
-      <default>suspend</default>
-      <locale name="C">
-        <short>Suspend button action</short>
-        <long>The action to take when the system suspend button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/buttons/hibernate</key>
-      <applyto>/apps/mate-power-manager/buttons/hibernate</applyto>
-      <type>string</type>
-      <default>hibernate</default>
-      <locale name="C">
-        <short>Hibernate button action</short>
-        <long>The action to take when the system hibernate button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/buttons/power</key>
-      <applyto>/apps/mate-power-manager/buttons/power</applyto>
-      <type>string</type>
-      <default>interactive</default>
-      <locale name="C">
-        <short>Power button action</short>
-        <long>The action to take when the system power button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/buttons/lid_battery</key>
-      <applyto>/apps/mate-power-manager/buttons/lid_battery</applyto>
-      <type>string</type>
-      <default>suspend</default>
-      <locale name="C">
-        <short>Laptop lid close action on battery</short>
-        <long>The action to take when the laptop lid is closed and the laptop is on battery power. Possible values are "suspend", "hibernate", "blank", and "nothing".</long>
-     </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/buttons/lid_ac</key>
-      <applyto>/apps/mate-power-manager/buttons/lid_ac</applyto>
-      <type>string</type>
-      <default>suspend</default>
-      <locale name="C">
-        <short>Laptop lid close action when on AC</short>
-        <long>The action to take when the laptop lid is closed and the laptop is on AC power. Possible values are "suspend", "hibernate", "blank" and "nothing".</long>
-     </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/general/installed_schema</key>
-      <applyto>/apps/mate-power-manager/general/installed_schema</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>3</default>
-      <locale name="C">
-        <short>The default configuration version</short>
-        <long>The version of the installed version of the schema. Do not edit this value, it is used so that configure changes between versions can be detected.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/general/use_profile_time</key>
-      <applyto>/apps/mate-power-manager/general/use_profile_time</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If the learnt profile should be used to calculate the time remaining</short>
-        <long>If the learnt profile should be used to calculate the time remaining. Only turn this off for debugging.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/general/use_time_for_policy</key>
-      <applyto>/apps/mate-power-manager/general/use_time_for_policy</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether to use time-based notifications</short>
-        <long>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/general/check_type_cpu</key>
-      <applyto>/apps/mate-power-manager/general/check_type_cpu</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Check CPU load before sleeping</short>
-        <long>If the CPU load should be checked before doing the idle action.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/general/network_sleep</key>
-      <applyto>/apps/mate-power-manager/general/network_sleep</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Whether NetworkManager should be connected and disconnected on sleep</short>
-        <long>Whether NetworkManager should disconnect before suspending or hibernating and connect on resume.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/use_screensaver_settings</key>
-      <applyto>/apps/mate-power-manager/lock/use_screensaver_settings</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Use mate-screensaver lock setting</short>
-        <long>Whether to use the screen lock setting of mate-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/blank_screen</key>
-      <applyto>/apps/mate-power-manager/lock/blank_screen</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Lock screen when blanked</short>
-        <long>Whether the screen is locked when the screen is turned off. Only used if lock_use_screensaver_settings is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/suspend</key>
-      <applyto>/apps/mate-power-manager/lock/suspend</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Lock screen on suspend</short>
-        <long>Whether the screen is locked when the computer wakes up from a suspend. Only used if lock_use_screensaver_settings is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/hibernate</key>
-      <applyto>/apps/mate-power-manager/lock/hibernate</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Lock screen on hibernate</short>
-        <long>Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock_use_screensaver_settings is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/mate_keyring_suspend</key>
-      <applyto>/apps/mate-power-manager/lock/mate_keyring_suspend</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Lock MATE keyring on sleep</short>
-        <long>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/lock/mate_keyring_hibernate</key>
-      <applyto>/apps/mate-power-manager/lock/mate_keyring_hibernate</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Lock MATE keyring on sleep</short>
-        <long>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/disks/spindown_enable_ac</key>
-      <applyto>/apps/mate-power-manager/disks/spindown_enable_ac</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>If the low-power mode should be enabled when on AC</short>
-        <long>If the system low-power mode should be enabled when on AC power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/disks/spindown_enable_battery</key>
-      <applyto>/apps/mate-power-manager/disks/spindown_enable_battery</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If the low-power mode should be enabled when on battery</short>
-        <long>If the system low-power mode should be enabled when on laptop battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/disks/spindown_timeout_ac</key>
-      <applyto>/apps/mate-power-manager/disks/spindown_timeout_ac</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>Seconds of inactivity to spin down when on AC</short>
-        <long>The number of seconds of inactivity to spin down the disks when on AC power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/disks/spindown_timeout_battery</key>
-      <applyto>/apps/mate-power-manager/disks/spindown_timeout_battery</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>60</default>
-      <locale name="C">
-        <short>Seconds of inactivity to spin down when on battery</short>
-        <long>The number of seconds of inactivity to spin down the disks when on battery power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/perhaps_recall</key>
-      <applyto>/apps/mate-power-manager/notify/perhaps_recall</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If we should show the recalled battery warning for a broken battery</short>
-        <long>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/low_capacity</key>
-      <applyto>/apps/mate-power-manager/notify/low_capacity</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If we should show the low capacity warning for a broken battery</short>
-        <long>If we should show the low capacity warning for a broken battery.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/discharging</key>
-      <applyto>/apps/mate-power-manager/notify/discharging</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Notify when AC adapter is disconnected</short>
-        <long>If the user should be notified when the AC adapter is disconnected.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/fully_charged</key>
-      <applyto>/apps/mate-power-manager/notify/fully_charged</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Notify when fully charged</short>
-        <long>If a notification message should be displayed when the battery is fully charged.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/sleep_failed</key>
-      <applyto>/apps/mate-power-manager/notify/sleep_failed</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Notify on a sleep failure</short>
-        <long>If a notification message should be displayed after suspend or hibernate failed.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/sleep_failed_uri</key>
-      <applyto>/apps/mate-power-manager/notify/sleep_failed_uri</applyto>
-      <owner>mate-power-manager</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>The URI to show to the user on sleep failure</short>
-        <long>When sleep fails we can show the user a button to help fix the situation. Leave this blank if the button should not be shown.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/notify/low_power</key>
-      <applyto>/apps/mate-power-manager/notify/low_power</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Notify on a low power</short>
-        <long>If a notification message should be displayed when the battery is getting low.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/statistics/show_axis_labels</key>
-      <applyto>/apps/mate-power-manager/statistics/show_axis_labels</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether we should show the axis labels in the statistics window</short>
-        <long>Whether we should show the axis labels in the statistics window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/statistics/show_events</key>
-      <applyto>/apps/mate-power-manager/statistics/show_events</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether we should show the events in the statistics window</short>
-        <long>Whether we should show the events in the statistics window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/statistics/smooth_data</key>
-      <applyto>/apps/mate-power-manager/statistics/smooth_data</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Whether we should smooth the data in the graph</short>
-        <long>Whether we should smooth the data in the graph.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/statistics/graph_type</key>
-      <applyto>/apps/mate-power-manager/statistics/graph_type</applyto>
-      <owner>mate-power-manager</owner>
-      <type>string</type>
-      <default>power</default>
-      <locale name="C">
-        <short>The default graph type to show in the statistics window</short>
-        <long>The default graph type to show in the statistics window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/statistics/data_max_time</key>
-      <applyto>/apps/mate-power-manager/statistics/data_max_time</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>21600</default>
-      <locale name="C">
-        <short>The maximum time displayed on the graph</short>
-        <long>The maximum duration of time displayed on the x-axis of the graph.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/percentage_low</key>
-      <applyto>/apps/mate-power-manager/thresholds/percentage_low</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>10</default>
-      <locale name="C">
-        <short>Percentage considered low</short>
-        <long>The percentage of the battery when it is considered low. Only valid when use_time_for_policy is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/percentage_critical</key>
-      <applyto>/apps/mate-power-manager/thresholds/percentage_critical</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>3</default>
-      <locale name="C">
-        <short>Percentage considered critical</short>
-        <long>The percentage of the battery when it is considered critical. Only valid when use_time_for_policy is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/percentage_action</key>
-      <applyto>/apps/mate-power-manager/thresholds/percentage_action</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>2</default>
-      <locale name="C">
-        <short>Percentage action is taken</short>
-        <long>The percentage of the battery when the critical action is performed. Only valid when use_time_for_policy is false.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/time_low</key>
-      <applyto>/apps/mate-power-manager/thresholds/time_low</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>1200</default>
-      <locale name="C">
-        <short>The time remaining when low</short>
-        <long>The time remaining in seconds of the battery when it is considered low. Only valid when use_time_for_policy is true.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/time_critical</key>
-      <applyto>/apps/mate-power-manager/thresholds/time_critical</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>300</default>
-      <locale name="C">
-        <short>The time remaining when critical</short>
-        <long>The time remaining in seconds of the battery when it is considered critical. Only valid when use_time_for_policy is true.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/thresholds/time_action</key>
-      <applyto>/apps/mate-power-manager/thresholds/time_action</applyto>
-      <owner>mate-power-manager</owner>
-      <type>int</type>
-      <default>120</default>
-      <locale name="C">
-        <short>The time remaining when action is taken</short>
-        <long>The time remaining in seconds of the battery when critical action is taken. Only valid when use_time_for_policy is true.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_computer_battery</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_computer_battery</applyto>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Sleep timeout computer when on battery</short>
-        <long>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_computer_ac</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_computer_ac</applyto>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Sleep timeout computer when on AC</short>
-        <long>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_computer_ups</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_computer_ups</applyto>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Sleep timeout computer when on UPS</short>
-        <long>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_display_ac</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_display_ac</applyto>
-      <type>int</type>
-      <default>1800</default>
-      <locale name="C">
-        <short>Sleep timeout display when on AC</short>
-        <long>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_display_battery</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_display_battery</applyto>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>Sleep timeout display when on battery</short>
-        <long>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/timeout/sleep_display_ups</key>
-      <applyto>/apps/mate-power-manager/timeout/sleep_display_ups</applyto>
-      <type>int</type>
-      <default>600</default>
-      <locale name="C">
-        <short>Sleep timeout display when on UPS</short>
-        <long>The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/ui/enable_sound</key>
-      <applyto>/apps/mate-power-manager/ui/enable_sound</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If sounds should be used</short>
-        <long>If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/ui/show_actions</key>
-      <applyto>/apps/mate-power-manager/ui/show_actions</applyto>
-      <owner>mate-power-manager</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>If preferences and statistics items should be shown in the context menu</short>
-        <long></long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/mate-power-manager/ui/icon_policy</key>
-      <applyto>/apps/mate-power-manager/ui/icon_policy</applyto>
-      <owner>mate-power-manager</owner>
-      <type>string</type>
-      <default>present</default>
-      <locale name="C">
-        <short>When to show the notification icon</short>
-        <long>Display options for the notification icon. Valid options are "never", "low", "critical", "charge", "present" and "always".</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</mateconfschemafile>
diff --git a/data/org.mate.power-manager.gschema.xml b/data/org.mate.power-manager.gschema.xml
new file mode 100644
index 0000000..0d930e5
--- /dev/null
+++ b/data/org.mate.power-manager.gschema.xml
@@ -0,0 +1,338 @@
+<schemalist>
+  <schema id="org.mate.power-manager" path="/org/mate/power-manager/">
+    <key name="action-sleep-type-battery" type="s">
+      <default>'hibernate'</default>
+      <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+      <description>The type of sleeping that should be performed when the computer is inactive. Possible values are "hibernate", "suspend" and "nothing".</description>
+    </key>
+    <key name="action-critical-battery" type="s">
+      <default>'hibernate'</default>
+      <summary>Battery critical low action</summary>
+      <description>The action to take when the battery is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</description>
+    </key>
+    <key name="event-when-closed-battery" type="b">
+      <default>true</default>
+      <summary>If the battery event should occur when the lid is shut and the power disconnected</summary>
+      <description>If the battery lid close event should occur (for example 'Suspend when lid closed on battery') when the lid is previously shut and the AC power disconnected at a later time.</description>
+    </key>
+    <key name="action-sleep-type-ac" type="s">
+      <default>'suspend'</default>
+      <summary>Whether to hibernate, suspend or do nothing when inactive</summary>
+      <description>The type of sleeping that should be performed when the computer is inactive. Possible values are "hibernate", "suspend" and "nothing".</description>
+    </key>
+    <key name="action-critical-ups" type="s">
+      <default>'shutdown'</default>
+      <summary>UPS critical low action</summary>
+      <description>The action to take when the UPS is critically low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</description>
+    </key>
+    <key name="action-low-ups" type="s">
+      <default>'hibernate'</default>
+      <summary>UPS low power action</summary>
+      <description>The action to take when the UPS is low. Possible values are "hibernate", "suspend", "shutdown" and "nothing".</description>
+    </key>
+    <key name="backlight-enable" type="b">
+      <default>true</default>
+      <summary>Allow backlight brightness adjustment</summary>
+      <description>If the screen brightness should be changed when switching between AC and battery power.</description>
+    </key>
+    <key name="backlight-battery-reduce" type="b">
+      <default>true</default>
+      <summary>Reduce the backlight brightness when on battery power</summary>
+      <description>If the screen should be reduced in brightness when the computer is on battery power.</description>
+    </key>
+    <key name="idle-brightness" type="i">
+      <default>30</default>
+      <summary>The brightness of the screen when idle</summary>
+      <description>This is the laptop panel screen brightness used when the session is idle. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="idle-dim-battery" type="b">
+      <default>true</default>
+      <summary>Dim the screen after a period of inactivity when on battery power</summary>
+      <description>If the screen should be dimmed to save power when the computer is idle when on battery power.</description>
+    </key>
+    <key name="idle-dim-time" type="i">
+      <default>10</default>
+      <summary>The default amount of time to dim the screen after idle</summary>
+      <description>The default amount of time to dim the screen after idle.</description>
+    </key>
+    <key name="brightness-dim-battery" type="i">
+      <default>50</default>
+      <summary>LCD dimming amount when on battery</summary>
+      <description>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100.</description>
+    </key>
+    <key name="idle-dim-ac" type="b">
+      <default>false</default>
+      <summary>Dim the screen after a period of inactivity when on AC power</summary>
+      <description>If the screen should be dimmed to save power when the computer is idle when on AC power.</description>
+    </key>
+    <key name="dpms-method-ac" type="s">
+      <default>'off'</default>
+      <summary>Method used to blank screen on AC</summary>
+      <description>The DPMS method used to blank the screen when on AC power. Possible values are "standby", "suspend" and "off".</description>
+    </key>
+    <key name="dpms-method-battery" type="s">
+      <default>'off'</default>
+      <summary>Method used to blank screen on battery</summary>
+      <description>The DPMS method used to blank the screen when on battery power. Possible values are "standby", "suspend" and "off".</description>
+    </key>
+    <key name="brightness-ac" type="d">
+      <default>100.0</default>
+      <summary>LCD brightness when on AC</summary>
+      <description>The brightness of the display when on AC power. Possible values are between 0.0 and 100.0.</description>
+    </key>
+    <key name="button-suspend" type="s">
+      <default>'suspend'</default>
+      <summary>Suspend button action</summary>
+      <description>The action to take when the system suspend button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</description>
+    </key>
+    <key name="button-hibernate" type="s">
+      <default>'hibernate'</default>
+      <summary>Hibernate button action</summary>
+      <description>The action to take when the system hibernate button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</description>
+    </key>
+    <key name="button-power" type="s">
+      <default>'interactive'</default>
+      <summary>Power button action</summary>
+      <description>The action to take when the system power button is pressed. Possible values are "suspend", "hibernate", "interactive", "shutdown" and "nothing".</description>
+    </key>
+    <key name="button-lid-battery" type="s">
+      <default>'suspend'</default>
+      <summary>Laptop lid close action on battery</summary>
+      <description>The action to take when the laptop lid is closed and the laptop is on battery power. Possible values are "suspend", "hibernate", "blank", and "nothing".</description>
+    </key>
+    <key name="button-lid-ac" type="s">
+      <default>'suspend'</default>
+      <summary>Laptop lid close action when on AC</summary>
+      <description>The action to take when the laptop lid is closed and the laptop is on AC power. Possible values are "suspend", "hibernate", "blank" and "nothing".</description>
+    </key>
+    <key name="schema-version" type="i">
+      <default>3</default>
+      <summary>The default configuration version.</summary>
+      <description>The version of the installed version of the schema. Do not edit this value, it is used so that configure changes between versions can be detected.</description>
+    </key>
+    <key name="use-profile-time" type="b">
+      <default>true</default>
+      <summary>If the learnt profile should be used to calculate the time remaining</summary>
+      <description>If the learnt profile should be used to calculate the time remaining. Only turn this off for debugging.</description>
+    </key>
+    <key name="use-time-for-policy" type="b">
+      <default>true</default>
+      <summary>Whether to use time-based notifications</summary>
+      <description>If time based notifications should be used. If set to false, then the percentage change is used instead, which may fix a broken ACPI BIOS.</description>
+    </key>
+    <key name="check-type-cpu" type="b">
+      <default>false</default>
+      <summary>Check CPU load before sleeping</summary>
+      <description>If the CPU load should be checked before doing the idle action.</description>
+    </key>
+    <key name="network-sleep" type="b">
+      <default>false</default>
+      <summary>Whether NetworkManager should be connected and disconnected on sleep.</summary>
+      <description>Whether NetworkManager should disconnect before suspending or hibernating and connect on resume.</description>
+    </key>
+    <key name="lock-use-screensaver" type="b">
+      <default>true</default>
+      <summary>Use mate-screensaver lock setting</summary>
+      <description>Whether to use the screen lock setting of mate-screensaver to decide if the screen is locked after a hibernate, suspend or blank screen.</description>
+    </key>
+    <key name="lock-blank-screen" type="b">
+      <default>true</default>
+      <summary>Lock screen when blanked</summary>
+      <description>Whether the screen is locked when the screen is turned off. Only used if lock-use-screensaver is false.</description>
+    </key>
+    <key name="lock-suspend" type="b">
+      <default>true</default>
+      <summary>Lock screen on suspend</summary>
+      <description>Whether the screen is locked when the computer wakes up from a suspend. Only used if lock-use-screensaver is false.</description>
+    </key>
+    <key name="lock-hibernate" type="b">
+      <default>true</default>
+      <summary>Lock screen on hibernate</summary>
+      <description>Whether the screen is locked when the computer wakes up from a hibernate. Only used if lock-use-screensaver is false.</description>
+    </key>
+    <key name="lock-keyring-suspend" type="b">
+      <default>false</default>
+      <summary>Lock MATE keyring on sleep</summary>
+      <description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</description>
+    </key>
+    <key name="lock-keyring-hibernate" type="b">
+      <default>true</default>
+      <summary>Lock MATE keyring on sleep</summary>
+      <description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</description>
+    </key>
+    <key name="spindown-enable-ac" type="b">
+      <default>false</default>
+      <summary>If the low-power mode should be enabled when on AC</summary>
+      <description>If the system low-power mode should be enabled when on AC power.</description>
+    </key>
+    <key name="spindown-enable-battery" type="b">
+      <default>true</default>
+      <summary>If the low-power mode should be enabled when on battery</summary>
+      <description>If the system low-power mode should be enabled when on laptop battery power.</description>
+    </key>
+    <key name="spindown-timeout-ac" type="i">
+      <default>600</default>
+      <summary>Seconds of inactivity to spin down when on AC</summary>
+      <description>The number of seconds of inactivity to spin down the disks when on AC power.</description>
+    </key>
+    <key name="spindown-timeout-battery" type="i">
+      <default>60</default>
+      <summary>Seconds of inactivity to spin down when on battery</summary>
+      <description>The number of seconds of inactivity to spin down the disks when on battery power.</description>
+    </key>
+    <key name="notify-perhaps-recall" type="b">
+      <default>true</default>
+      <summary>If we should show the recalled battery warning for a broken battery</summary>
+      <description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</description>
+    </key>
+    <key name="notify-low-capacity" type="b">
+      <default>true</default>
+      <summary>If we should show the low capacity warning for a broken battery</summary>
+      <description>If we should show the low capacity warning for a broken battery.</description>
+    </key>
+    <key name="notify-discharging" type="b">
+      <default>true</default>
+      <summary>Notify when AC adapter is disconnected</summary>
+      <description>If the user should be notified when the AC adapter is disconnected.</description>
+    </key>
+    <key name="notify-fully-charged" type="b">
+      <default>false</default>
+      <summary>Notify when fully charged</summary>
+      <description>If a notification message should be displayed when the battery is fully charged.</description>
+    </key>
+    <key name="notify-sleep-failed" type="b">
+      <default>true</default>
+      <summary>Notify on a sleep failure</summary>
+      <description>If a notification message should be displayed after suspend or hibernate failed.</description>
+    </key>
+    <key name="notify-sleep-failed-uri" type="s">
+      <default>''</default>
+      <summary>The URI to show to the user on sleep failure</summary>
+      <description>When sleep fails we can show the user a button to help fix the situation. Leave this blank if the button should not be shown.</description>
+    </key>
+    <key name="notify-low-power" type="b">
+      <default>true</default>
+      <summary>Notify on a low power</summary>
+      <description>If a notification message should be displayed when the battery is getting low.</description>
+    </key>
+    <key name="info-history-graph-points" type="b">
+      <default>true</default>
+      <summary>Whether we should show the history data points</summary>
+      <description>Whether we should show the history data points in the statistics window.</description>
+    </key>
+    <key name="info-history-graph-smooth" type="b">
+      <default>true</default>
+      <summary>Whether we should smooth the history data</summary>
+      <description>Whether we should smooth the history data in the graph.</description>
+    </key>
+    <key name="info-history-type" type="s">
+      <default>'power'</default>
+      <summary>The default graph type to show for history</summary>
+      <description>The default graph type to show in the history window.</description>
+    </key>
+    <key name="info-history-time" type="i">
+      <default>21600</default>
+      <summary>The maximum time displayed for history</summary>
+      <description>The maximum duration of time displayed on the x-axis of the history graph.</description>
+    </key>
+    <key name="info-stats-graph-points" type="b">
+      <default>true</default>
+      <summary>Whether we should show the stats data points</summary>
+      <description>Whether we should show the stats data points in the statistics window.</description>
+    </key>
+    <key name="info-stats-graph-smooth" type="b">
+      <default>true</default>
+      <summary>Whether we should smooth the stats data</summary>
+      <description>Whether we should smooth the stats data in the graph.</description>
+    </key>
+    <key name="info-stats-type" type="s">
+      <default>'power'</default>
+      <summary>The default graph type to show for stats</summary>
+      <description>The default graph type to show in the stats window.</description>
+    </key>
+    <key name="info-page-number" type="i">
+      <default>0</default>
+      <summary>The index of the page number to show by default</summary>
+      <description>The index of the page number to show by default which is used to return focus to the correct page.</description>
+    </key>
+    <key name="info-last-device" type="s">
+      <default>''</default>
+      <summary>The ID of the last device selected</summary>
+      <description>The identifier of the last device which is used to return focus to the correct device.</description>
+    </key>
+    <key name="percentage-low" type="i">
+      <default>10</default>
+      <summary>Percentage considered low</summary>
+      <description>The percentage of the battery when it is considered low. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="percentage-critical" type="i">
+      <default>3</default>
+      <summary>Percentage considered critical</summary>
+      <description>The percentage of the battery when it is considered critical. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="percentage-action" type="i">
+      <default>2</default>
+      <summary>Percentage action is taken</summary>
+      <description>The percentage of the battery when the critical action is performed. Only valid when use-time-for-policy is false.</description>
+    </key>
+    <key name="time-low" type="i">
+      <default>1200</default>
+      <summary>The time remaining when low</summary>
+      <description>The time remaining in seconds of the battery when it is considered low. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="time-critical" type="i">
+      <default>300</default>
+      <summary>The time remaining when critical</summary>
+      <description>The time remaining in seconds of the battery when it is considered critical. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="time-action" type="i">
+      <default>120</default>
+      <summary>The time remaining when action is taken</summary>
+      <description>The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true.</description>
+    </key>
+    <key name="sleep-computer-battery" type="i">
+      <default>0</default>
+      <summary>Sleep timeout computer when on battery</summary>
+      <description>The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep.</description>
+    </key>
+    <key name="sleep-computer-ac" type="i">
+      <default>0</default>
+      <summary>Sleep timeout computer when on AC</summary>
+      <description>The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep.</description>
+    </key>
+    <key name="sleep-computer-ups" type="i">
+      <default>0</default>
+      <summary>Sleep timeout computer when on UPS</summary>
+      <description>The amount of time in seconds the computer on UPS power needs to be inactive before it goes to sleep.</description>
+    </key>
+    <key name="sleep-display-ac" type="i">
+      <default>1800</default>
+      <summary>Sleep timeout display when on AC</summary>
+      <description>The amount of time in seconds before the display goes to sleep when the computer is on AC power.</description>
+    </key>
+    <key name="sleep-display-battery" type="i">
+      <default>600</default>
+      <summary>Sleep timeout display when on battery</summary>
+      <description>The amount of time in seconds the computer on battery power needs to be inactive before the display goes to sleep.</description>
+    </key>
+    <key name="sleep-display-ups" type="i">
+      <default>600</default>
+      <summary>Sleep timeout display when on UPS</summary>
+      <description>The amount of time in seconds the computer on UPS power needs to be inactive before the display goes to sleep.</description>
+    </key>
+    <key name="enable-sound" type="b">
+      <default>true</default>
+      <summary>If sounds should be used</summary>
+      <description>If sounds should be used when the power is critically low, or inhibit requests have stopped the policy action.</description>
+    </key>
+    <key name="show-actions" type="b">
+      <default>true</default>
+      <summary>If preferences and statistics items should be shown in the context menu</summary>
+    </key>
+    <key name="icon-policy" type="s">
+      <default>'present'</default>
+      <summary>When to show the notification icon</summary>
+      <description>Display options for the notification icon. Valid options are "never", "low", "critical", "charge", and "present".</description>
+    </key>
+  </schema>
+</schemalist>