From 2bf2a241be5473bae6f67275fe6e2dcd0f01e16f97cc9a1f2c10fbe5188447e3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 28 Sep 2017 12:08:55 +0000 Subject: [PATCH] Accepting request 529050 from home:xiaoguang_wang:branches:GNOME:Factory - Add gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch: Fix using keyboard can't unlock screen (bgo#788169). OBS-URL: https://build.opensuse.org/request/show/529050 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=329 --- ...d-loginDialog-grab-focus-when-locked.patch | 27 +++++++++++++++++++ gnome-shell-domain.patch | 4 +-- gnome-shell.changes | 6 +++++ gnome-shell.spec | 3 +++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch diff --git a/gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch b/gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch new file mode 100644 index 0000000..e075240 --- /dev/null +++ b/gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch @@ -0,0 +1,27 @@ +From 8a46458bf59300fb73ac4d1271c80c5b9ab571c4 Mon Sep 17 00:00:00 2001 +From: Xiaoguang Wang +Date: Tue, 26 Sep 2017 16:54:15 +0800 +Subject: [PATCH] gdm: Avoid loginDialog grab focus when locked + +https://bugzilla.gnome.org/show_bug.cgi?id=788169 +--- + js/gdm/loginDialog.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js +index 1cae3db85..b83129150 100644 +--- a/js/gdm/loginDialog.js ++++ b/js/gdm/loginDialog.js +@@ -1128,7 +1128,8 @@ var LoginDialog = new Lang.Class({ + this._sessionMenuButton.close(); + this._setUserListExpanded(true); + this._notListedButton.show(); +- this._userList.actor.grab_key_focus(); ++ if (!Main.screenShield.locked) ++ this._userList.actor.grab_key_focus(); + }, + + _beginVerificationForItem: function(item) { +-- +2.12.3 + diff --git a/gnome-shell-domain.patch b/gnome-shell-domain.patch index 458210b..18e9d54 100644 --- a/gnome-shell-domain.patch +++ b/gnome-shell-domain.patch @@ -357,9 +357,9 @@ Index: gnome-shell-3.26.0/js/gdm/loginDialog.js + if (this._domainMenuButton.domain_enabled) + this._domainMenuButton.actor.show(); + this._userLayout.show(); - this._userList.actor.grab_key_focus(); + if (!Main.screenShield.locked) + this._userList.actor.grab_key_focus(); }, - Index: gnome-shell-3.26.0/po/POTFILES.in =================================================================== --- gnome-shell-3.26.0.orig/po/POTFILES.in diff --git a/gnome-shell.changes b/gnome-shell.changes index 0b86277..e2fef64 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 28 01:59:13 UTC 2017 - xwang@suse.com + +- Add gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch: + Fix using keyboard can't unlock screen (bgo#788169). + ------------------------------------------------------------------- Tue Sep 19 10:02:41 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 7108e96..38f29b5 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -61,6 +61,8 @@ Patch17: gnome-shell-dateMenu-fixes.patch Patch18: gnome-shell-fix-crash-hint-actor-NULL.patch # PATCH-FIX-UPSTREAM gnome-shell-only-listen-window-created-events-once.patch bgo#787361 zaitor@opensuse.org -- gtk-embed: ensure we only listen for window-created events once Patch19: gnome-shell-only-listen-window-created-events-once.patch +# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bgo#788169 xwang@suse.com -- Avoid login dialog grabs focus when screen locked +Patch20: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch ## NOTE: Keep SLE Classic patches at bottom. # PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support Patch1000: gs-sle-classic-ext.patch @@ -190,6 +192,7 @@ into GNOME Shell calendar. # Needs rebase #patch1 -p1 %patch2 -p1 +%patch20 -p1 %if !0%{?is_opensuse} %patch3 -p1 %patch4 -p1