summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-20 00:01:49 +0200
committerBastien Nocera <hadess@hadess.net>2013-11-07 17:18:21 +0100
commitfcea8bec0a73ce1f5803a8273f7865d8554bd033 (patch)
tree6b0705d62954a0fed79b22b5f76dd65e813f76d8
parent6ffc07f87a09deeaa4bbd6156fc1dbd733d4ab27 (diff)
downloadgnome-settings-daemon-fcea8bec0a73ce1f5803a8273f7865d8554bd033.tar.gz
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
-rw-r--r--plugins/media-keys/gsd-media-keys-manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2c46d741..cab4aa29 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;