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

Accepting request 523747 from home:mgorse:branches:GNOME:Factory

Browse Source 
- Rebase gnome-settings-daemon-more-power-button-actions.patch and
  enable for SLE 15 (bsc#1057770).

OBS-URL: https://build.opensuse.org/request/show/523747
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=300
This commit is contained in:
Dominique Leuenberger 2017-09-12 20:01:35 +00:00 committed by Git OBS Bridge
parent bc8ff0aea6
commit ea7c0e755c
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome-settings-daemon-more-power-button-actions.patch
View File

@ -12,20 +12,20 @@ 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
@@ -113,6 +113,8 @@ typedef enum
@@ -105,6 +105,8 @@ typedef enum
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
} GsdPowerButtonActionType;
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
@@ -1929,6 +1929,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
@@ -1953,6 +1953,12 @@ do_config_power_button_action (GsdMediaKeysManager *manager,
action_type = g_settings_get_enum (manager->priv->power_settings, "power-button-action");
switch (action_type) {

6
gnome-settings-daemon.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 12 14:45:19 UTC 2017 - mgorse@suse.com
- Rebase gnome-settings-daemon-more-power-button-actions.patch and
enable for SLE 15 (bsc#1057770).
-------------------------------------------------------------------
Tue Sep 12 09:17:07 UTC 2017 - dimstar@opensuse.org

4
gnome-settings-daemon.spec
View File

@ -48,7 +48,7 @@ Patch4: gnome-settings-daemon-initial-keyboard.patch
Patch5: gnome-settings-daemon-bring-back-updates-plugin.patch
# 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.
Patch6: gnome-settings-daemon-more-power-button-actions.patch
# PATFH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
# PATCH-FIX-OPENSUSE gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
Patch7: gnome-settings-daemon-switch-Japanese-default-input-to-mozc.patch
BuildRequires: cups-devel
BuildRequires: fdupes
@ -166,6 +166,8 @@ gnome-patch-translation-prepare
%patch4 -p1
%if 0%{?suse_version} == 1315
%patch5 -p1
%endif
%if 0%{?suse_version} == 1315 || !0%{?is_opensuse}
%patch6 -p1
%endif
%patch7 -p1