[gnome-settings-daemon] media-keys: Restore interactive option for power button



commit 5f0d47deb8a6aad5d31387787335753344a03d83
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon Jun 12 11:57:54 2017 -0400

    media-keys: Restore interactive option for power button
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781108

 data/gsd-enums.h                            |    5 +++--
 plugins/media-keys/gsd-media-keys-manager.c |    3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/data/gsd-enums.h b/data/gsd-enums.h
index 853caf3..eea1fb1 100644
--- a/data/gsd-enums.h
+++ b/data/gsd-enums.h
@@ -99,14 +99,15 @@ typedef enum
   GSD_POWER_ACTION_HIBERNATE,
   GSD_POWER_ACTION_INTERACTIVE,
   GSD_POWER_ACTION_NOTHING,
-  GSD_POWER_ACTION_LOGOUT,
+  GSD_POWER_ACTION_LOGOUT
 } GsdPowerActionType;
 
 typedef enum
 {
   GSD_POWER_BUTTON_ACTION_NOTHING,
   GSD_POWER_BUTTON_ACTION_SUSPEND,
-  GSD_POWER_BUTTON_ACTION_HIBERNATE
+  GSD_POWER_BUTTON_ACTION_HIBERNATE,
+  GSD_POWER_BUTTON_ACTION_INTERACTIVE
 } GsdPowerButtonActionType;
 
 typedef enum
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 7f98bfc..59209b0 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1959,6 +1959,9 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
         case GSD_POWER_BUTTON_ACTION_HIBERNATE:
                 do_config_power_action (manager, GSD_POWER_ACTION_HIBERNATE, in_lock_screen);
                 break;
+        case GSD_POWER_BUTTON_ACTION_INTERACTIVE:
+                do_config_power_action (manager, GSD_POWER_ACTION_INTERACTIVE, in_lock_screen);
+                break;
         case GSD_POWER_BUTTON_ACTION_NOTHING:
                 /* do nothing */
                 break;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]