[gnome-settings-daemon] media-keys: Fix logic error when handling power keys
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] media-keys: Fix logic error when handling power keys
- Date: Wed, 1 Apr 2015 09:38:04 +0000 (UTC)
commit a733ec31612f74ebea7ccc66fc58ad5bce664a2b
Author: Bastien Nocera <hadess hadess net>
Date: Wed Apr 1 11:34:14 2015 +0200
media-keys: Fix logic error when handling power keys
In the lock screen, means non-interactive action:
in_lock_screen == !power_action_interactive
Rename the variable to avoid having to invert it twice.
Spotted by Clément Guérin <geecko dev free fr>
https://bugzilla.gnome.org/show_bug.cgi?id=746980
plugins/media-keys/gsd-media-keys-manager.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index c5cbebd..2c87a5e 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -2029,7 +2029,7 @@ do_action (GsdMediaKeysManager *manager,
{
g_debug ("Launching action for key type '%d' (on device id %d)", type, deviceid);
- gboolean power_action_interactive = !(POWER_KEYS_MODE_NO_DIALOG & mode);
+ gboolean power_action_noninteractive = (POWER_KEYS_MODE_NO_DIALOG & mode);
switch (type) {
case TOUCHPAD_KEY:
@@ -2150,16 +2150,16 @@ do_action (GsdMediaKeysManager *manager,
do_toggle_contrast_action (manager);
break;
case POWER_KEY:
- do_config_power_action (manager, "button-power", power_action_interactive);
+ do_config_power_action (manager, "button-power", power_action_noninteractive);
break;
case SLEEP_KEY:
- do_config_power_action (manager, "button-sleep", power_action_interactive);
+ do_config_power_action (manager, "button-sleep", power_action_noninteractive);
break;
case SUSPEND_KEY:
- do_config_power_action (manager, "button-suspend", power_action_interactive);
+ do_config_power_action (manager, "button-suspend", power_action_noninteractive);
break;
case HIBERNATE_KEY:
- do_config_power_action (manager, "button-hibernate", power_action_interactive);
+ do_config_power_action (manager, "button-hibernate", power_action_noninteractive);
break;
case SCREEN_BRIGHTNESS_UP_KEY:
case SCREEN_BRIGHTNESS_DOWN_KEY:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]