[gnome-settings-daemon] media-keys: Remove "button-*" configuration

[Bastien Nocera <hadess src gnome org>]

commit 50564cde49ca2e17fb7e59f36a35d61c2cbef1af
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Aug 31 18:13:04 2015 +0200

    media-keys: Remove "button-*" configuration
    
    The button-power, button-suspend, etc. configurations accept a
    GsdPowerActionType, but not all of the variants are supported:
            case GSD_POWER_ACTION_BLANK:
            case GSD_POWER_ACTION_LOGOUT:
            case GSD_POWER_ACTION_NOTHING:
                    /* these actions cannot be handled by media-keys and
                     * are not used in this context */
                    break;
    
    Given that we usually prefer to avoid this sort of configuration which should
    work out of the box, it would be better to have them act as they are labelled,
    and people who want to change the configurations at system level can use udev to
    apply a new keymap.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753713

 ...settings-daemon.plugins.power.gschema.xml.in.in |   21 --------------------
 plugins/media-keys/gsd-media-keys-manager.c        |   16 +++++---------
 2 files changed, 6 insertions(+), 31 deletions(-)
---
diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
index deec1f0..3adff21 100644
--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -40,27 +40,6 @@
       <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.</description>
     </key>
-    <key name="button-suspend" enum="org.gnome.settings-daemon.GsdPowerActionType">
-      <default>'suspend'</default>
-      <summary>Suspend button action</summary>
-      <description>The action to take when the system suspend button is pressed.</description>
-    </key>
-    <key name="button-hibernate" enum="org.gnome.settings-daemon.GsdPowerActionType">
-      <default>'hibernate'</default>
-      <summary>Hibernate button action</summary>
-      <description>The action to take when the system hibernate button is pressed.</description>
-    </key>
-    <key name="button-sleep" enum="org.gnome.settings-daemon.GsdPowerActionType">
-      <default>'hibernate'</default>
-      <summary>Sleep button action</summary>
-      <description>The action to take when the system sleep (non-specific type) button is 
pressed.</description>
-    </key>
-    <!-- See https://bugzilla.gnome.org/show_bug.cgi?id=652183 for rationale -->
-    <key name="button-power" enum="org.gnome.settings-daemon.GsdPowerActionType">
-      <default>'suspend'</default>
-      <summary>Power button action</summary>
-      <description>The action to take when the system power button is pressed.</description>
-    </key>
     <key name="ambient-enabled" type="b">
       <default>true</default>
       <summary>Enable the ALS sensor</summary>
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 69c5f8c..073f5fb 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1802,13 +1802,9 @@ power_action (GsdMediaKeysManager *manager,
 
 static void
 do_config_power_action (GsdMediaKeysManager *manager,
-                        const gchar *config_key,
-                        gboolean in_lock_screen)
+                        GsdPowerActionType   action_type,
+                        gboolean             in_lock_screen)
 {
-        GsdPowerActionType action_type;
-
-        action_type = g_settings_get_enum (manager->priv->power_settings,
-                                           config_key);
         switch (action_type) {
         case GSD_POWER_ACTION_SUSPEND:
                 power_action (manager, "Suspend", !in_lock_screen);
@@ -2155,16 +2151,16 @@ do_action (GsdMediaKeysManager *manager,
                do_toggle_contrast_action (manager);
                break;
         case POWER_KEY:
-                do_config_power_action (manager, "button-power", power_action_noninteractive);
+                do_config_power_action (manager, GSD_POWER_ACTION_SUSPEND, power_action_noninteractive);
                 break;
         case SLEEP_KEY:
-                do_config_power_action (manager, "button-sleep", power_action_noninteractive);
+                do_config_power_action (manager, GSD_POWER_ACTION_HIBERNATE, power_action_noninteractive);
                 break;
         case SUSPEND_KEY:
-                do_config_power_action (manager, "button-suspend", power_action_noninteractive);
+                do_config_power_action (manager, GSD_POWER_ACTION_SUSPEND, power_action_noninteractive);
                 break;
         case HIBERNATE_KEY:
-                do_config_power_action (manager, "button-hibernate", power_action_noninteractive);
+                do_config_power_action (manager, GSD_POWER_ACTION_HIBERNATE, power_action_noninteractive);
                 break;
         case SCREEN_BRIGHTNESS_UP_KEY:
         case SCREEN_BRIGHTNESS_DOWN_KEY: