1
0

Accepting request 526114 from home:fcrozat:branches:GNOME:Factory

- Rebase gnome-settings-daemon-more-power-button-actions.patch,
  part of the patch have been merged upstream.

OBS-URL: https://build.opensuse.org/request/show/526114
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=303
This commit is contained in:
Dominique Leuenberger 2017-09-14 14:37:21 +00:00 committed by Git OBS Bridge
parent fcedaa134e
commit 131db79108
2 changed files with 16 additions and 17 deletions

View File

@ -8,36 +8,29 @@ Subject: [PATCH] more power button actions
plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/data/gsd-enums.h b/data/gsd-enums.h
index 4a0356a..87fd158 100644
--- a/data/gsd-enums.h
+++ b/data/gsd-enums.h
@@ -105,6 +105,8 @@ typedef enum
Index: gnome-settings-daemon-3.26.0/data/gsd-enums.h
===================================================================
--- gnome-settings-daemon-3.26.0.orig/data/gsd-enums.h 2017-09-14 14:20:52.202275466 +0200
+++ gnome-settings-daemon-3.26.0/data/gsd-enums.h 2017-09-14 14:21:26.602338266 +0200
@@ -105,6 +105,7 @@
typedef enum
{
GSD_POWER_BUTTON_ACTION_NOTHING,
+ GSD_POWER_BUTTON_ACTION_INTERACTIVE,
+ GSD_POWER_BUTTON_ACTION_SHUTDOWN,
GSD_POWER_BUTTON_ACTION_SUSPEND,
GSD_POWER_BUTTON_ACTION_HIBERNATE,
GSD_POWER_BUTTON_ACTION_INTERACTIVE
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index d77ed10..e9611b9 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1953,6 +1953,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
Index: gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c
===================================================================
--- gnome-settings-daemon-3.26.0.orig/plugins/media-keys/gsd-media-keys-manager.c 2017-09-14 14:20:52.202275466 +0200
+++ gnome-settings-daemon-3.26.0/plugins/media-keys/gsd-media-keys-manager.c 2017-09-14 14:26:14.074784955 +0200
@@ -1953,6 +1953,9 @@
action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action");
switch (action_type) {
+ case GSD_POWER_BUTTON_ACTION_INTERACTIVE:
+ do_config_power_action (manager, GSD_POWER_ACTION_INTERACTIVE, in_lock_screen);
+ break;
+ case GSD_POWER_BUTTON_ACTION_SHUTDOWN:
+ do_config_power_action (manager, GSD_POWER_ACTION_SHUTDOWN, in_lock_screen);
+ break;
case GSD_POWER_BUTTON_ACTION_SUSPEND:
do_config_power_action (manager, GSD_POWER_ACTION_SUSPEND, in_lock_screen);
break;
--
2.6.6

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 14 15:10:00 CEST 2017 - fcrozat@suse.com
- Rebase gnome-settings-daemon-more-power-button-actions.patch,
part of the patch have been merged upstream.
-------------------------------------------------------------------
Thu Sep 14 11:41:17 UTC 2017 - fcrozat@suse.com