diff options
author | Bastien Nocera <hadess@hadess.net> | 2015-04-01 11:34:14 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2015-04-01 11:34:14 +0200 |
commit | a733ec31612f74ebea7ccc66fc58ad5bce664a2b (patch) | |
tree | af0e0ce138714173eb6486d8964a0e9b48395697 | |
parent | 7620ded4756268a9ea18548d18f132eae37a6144 (diff) | |
download | gnome-settings-daemon-a733ec31612f74ebea7ccc66fc58ad5bce664a2b.tar.gz |
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
-rw-r--r-- | 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 c5cbebd9..2c87a5ee 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: |