rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

Accepting request 428278 from home:zhangxiaofei:branches:GNOME:Factory

Browse Source 
- Rebase gnome-settings-daemon-revert-libinput-mandatory.patch
  for version 3.21.90.

- Rename gnome-settings-daemon-shutdown-with-power-button.patch to
  gnome-settings-daemon-more-power-button-actions.patch:
  Also add back the "interactive" power button action for
  consistency with SLES11 behavior (bsc#996342).

OBS-URL: https://build.opensuse.org/request/show/428278
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=258
This commit is contained in:
Dominique Leuenberger 2016-09-18 19:58:23 +00:00 committed by Git OBS Bridge
parent 4b894e533e
commit ec5fc1cacc
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnome-settings-daemon-shutdown-with-power-button.patch → gnome-settings-daemon-more-power-button-actions.patch
View File

@ -1,33 +1,37 @@
From 8b9b19bc4259b67822ed66f15f6cfac1284ced85 Mon Sep 17 00:00:00 2001 From 3d9c3ecda9c68039c309bfb6bfc93830c4a0e20e Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com> From: Felix Zhang <fezhang@suse.com>
Date: Wed, 7 Sep 2016 20:14:04 +0800 Date: Mon, 12 Sep 2016 18:00:07 +0800
Subject: [PATCH] shutdown with power key Subject: [PATCH] more power button actions
--- ---
data/gsd-enums.h | 1 + data/gsd-enums.h | 2 ++
plugins/media-keys/gsd-media-keys-manager.c | 3 +++ plugins/media-keys/gsd-media-keys-manager.c | 6 ++++++
2 files changed, 4 insertions(+) 2 files changed, 8 insertions(+)
diff --git a/data/gsd-enums.h b/data/gsd-enums.h diff --git a/data/gsd-enums.h b/data/gsd-enums.h
index 4a0356a..710d58c 100644 index 4a0356a..87fd158 100644
--- a/data/gsd-enums.h --- a/data/gsd-enums.h
+++ b/data/gsd-enums.h +++ b/data/gsd-enums.h
@@ -113,6 +113,7 @@ typedef enum @@ -113,6 +113,8 @@ typedef enum
typedef enum typedef enum
{ {
GSD_POWER_BUTTON_ACTION_NOTHING, GSD_POWER_BUTTON_ACTION_NOTHING,
+ GSD_POWER_BUTTON_ACTION_INTERACTIVE,
+ GSD_POWER_BUTTON_ACTION_SHUTDOWN, + GSD_POWER_BUTTON_ACTION_SHUTDOWN,
GSD_POWER_BUTTON_ACTION_SUSPEND, GSD_POWER_BUTTON_ACTION_SUSPEND,
GSD_POWER_BUTTON_ACTION_HIBERNATE GSD_POWER_BUTTON_ACTION_HIBERNATE
} GsdPowerButtonActionType; } GsdPowerButtonActionType;
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index d77ed10..6e0514d 100644 index d77ed10..e9611b9 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c --- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c +++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1929,6 +1929,9 @@ do_config_power_button_action (GsdMediaKeysManager *manager, @@ -1929,6 +1929,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action"); action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action");
switch (action_type) { 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: + case GSD_POWER_BUTTON_ACTION_SHUTDOWN:
+ do_config_power_action (manager, GSD_POWER_ACTION_SHUTDOWN, in_lock_screen); + do_config_power_action (manager, GSD_POWER_ACTION_SHUTDOWN, in_lock_screen);
+ break; + break;

1
gnome-settings-daemon-revert-libinput-mandatory.patch
View File

@ -1781,6 +1781,7 @@ index 954ac30..e78f463 100644
GList *devices, *l; GList *devices, *l;
- gboolean has_touchpad, has_touchscreen; - gboolean has_touchpad, has_touchscreen;
+ gboolean has_touchpad, has_touchscreen, has_trackball; + gboolean has_touchpad, has_touchscreen, has_trackball;
gboolean has_mouse;
gtk_init (&argc, &argv); gtk_init (&argc, &argv);

17
gnome-settings-daemon.changes
View File

@ -19,6 +19,20 @@ Tue Sep 13 21:06:34 UTC 2016 - zaitor@opensuse.org
patchname with our standard. patchname with our standard.
- Stop passing V=1 to make, we do debugging locally. - Stop passing V=1 to make, we do debugging locally.
-------------------------------------------------------------------
Mon Sep 12 11:19:11 UTC 2016 - fezhang@suse.com
- Rebase gnome-settings-daemon-revert-libinput-mandatory.patch
for version 3.21.90.
-------------------------------------------------------------------
Mon Sep 12 10:07:53 UTC 2016 - fezhang@suse.com
- Rename gnome-settings-daemon-shutdown-with-power-button.patch to
gnome-settings-daemon-more-power-button-actions.patch:
Also add back the "interactive" power button action for
consistency with SLES11 behavior (bsc#996342).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org Thu Sep 8 12:39:50 UTC 2016 - zaitor@opensuse.org
@ -126,10 +140,7 @@ Mon Apr 18 11:16:19 CDT 2016 - federico@suse.com
Mon Apr 18 08:33:57 UTC 2016 - alarrosa@suse.com Mon Apr 18 08:33:57 UTC 2016 - alarrosa@suse.com
- Update to GNOME 3.20.1 Fate#318572 - Update to GNOME 3.20.1 Fate#318572
- Rebased gnome-settings-daemon-notify-idle-resumed.patch. - Rebased gnome-settings-daemon-notify-idle-resumed.patch.
- Add gnome-settings-daemon-revert-libinput-mandatory.patch: do not
force libinput driver on SLE.
- Drop SLE patch: - Drop SLE patch:
gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch: gnome-settings-daemon-bnc862603-remove-battery-recall-code.patch:
fixed upstream. fixed upstream.

4
gnome-settings-daemon.spec
View File

@ -49,8 +49,8 @@ Patch24: gnome-settings-daemon-sle-configure-timeout-blank.patch
Patch29: gnome-settings-daemon-initial-keyboard.patch Patch29: gnome-settings-daemon-initial-keyboard.patch
# PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back # PATCH-FIX-OPENSUSE gnome-settings-daemon-bring-back-updates-plugin.patch bsc#991024 sckang@suse.com -- Add the updates plugin back
Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch Patch31: gnome-settings-daemon-bring-back-updates-plugin.patch
# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-shutdown-with-power-key.patch bsc#996342 fezhang@suse.com -- Bring back the shutdown option for power key # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
Patch32: gnome-settings-daemon-shutdown-with-power-button.patch Patch32: gnome-settings-daemon-more-power-button-actions.patch
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gtk-doc BuildRequires: gtk-doc