Blob Blame History Raw
From fcea8bec0a73ce1f5803a8273f7865d8554bd033 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sun, 20 Oct 2013 00:01:49 +0200
Subject: [PATCH 2/3] media-keys: Make the "shutdown" action not be interactive

Shutdown is supposed to shutdown without asking, as "interactive"
already should do what we need for interactive shutdowns.

https://bugzilla.gnome.org/show_bug.cgi?id=698733
---
 plugins/media-keys/gsd-media-keys-manager.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2c46d74..cab4aa2 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1791,9 +1791,11 @@ do_config_power_action (GsdMediaKeysManager *manager,
                 power_action (manager, "Suspend");
                 break;
         case GSD_POWER_ACTION_INTERACTIVE:
-        case GSD_POWER_ACTION_SHUTDOWN:
                 gnome_session_shutdown (manager);
                 break;
+        case GSD_POWER_ACTION_SHUTDOWN:
+                power_action (manager, "PowerOff");
+                break;
         case GSD_POWER_ACTION_HIBERNATE:
                 power_action (manager, "Hibernate");
                 break;
-- 
1.8.4.2