From c28380cf3f2aaf5c9433ae6aa51a8b092679d9d77374029ca6e58d206e295724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 12 Aug 2024 19:03:44 +0000 Subject: [PATCH] - Drop gs-fate318433-prevent-same-account-multi-logins.patch. Upstream now does this. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=586 --- gnome-shell.changes | 6 ++++ gnome-shell.spec | 3 -- ...33-prevent-same-account-multi-logins.patch | 34 ------------------- 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 gs-fate318433-prevent-same-account-multi-logins.patch diff --git a/gnome-shell.changes b/gnome-shell.changes index 51f3a05..7a8e4c7 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 12 17:28:18 UTC 2024 - Michael Gorse + +- Drop gs-fate318433-prevent-same-account-multi-logins.patch. + Upstream now does this. + ------------------------------------------------------------------- Thu Aug 8 20:16:23 UTC 2024 - Michael Gorse diff --git a/gnome-shell.spec b/gnome-shell.spec index 24331ac..30932bb 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -55,8 +55,6 @@ Patch1002: gnome-shell-domain.patch Patch1003: gnome-shell-screen-disappear.patch # PATCH-FIX-SLE endSession-dialog-update-time-label-every-sec.patch bnc#886132 cxiong@suse.com -- update time label every second in end session dialog Patch1004: endSession-dialog-update-time-label-every-sec.patch -# PATCH-NEEDS-REBASE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login. -Patch1007: gs-fate318433-prevent-same-account-multi-logins.patch # PATCH-FIX-SLE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area Patch1008: gnome-shell-disable-ibus-when-not-installed.patch # PATCH-FEATURE-SLE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680, boo#1172826 qkzhu@suse.com -- make GDM background image configurable @@ -203,7 +201,6 @@ popd %patch -P 1002 -p1 %patch -P 1003 -p1 %patch -P 1004 -p1 -#%%patch -P 1007 -p1 %patch -P 1008 -p1 %patch -P 1009 -p1 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 diff --git a/gs-fate318433-prevent-same-account-multi-logins.patch b/gs-fate318433-prevent-same-account-multi-logins.patch deleted file mode 100644 index 7cf137c..0000000 --- a/gs-fate318433-prevent-same-account-multi-logins.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: gnome-shell-41.9/js/gdm/loginDialog.js -=================================================================== ---- gnome-shell-41.9.orig/js/gdm/loginDialog.js -+++ gnome-shell-41.9/js/gdm/loginDialog.js -@@ -1044,6 +1044,29 @@ var LoginDialog = GObject.registerClass( - } - - _onSessionOpened(client, serviceName) { -+ if (this._user.get_num_sessions_anywhere() > 1) { -+ this._authPrompt.setMessage( -+ _('Sorry, you have to log out a previous session first. Multiple logins are not supported.'), -+ GdmUtil.MessageType.ERROR); -+ // TODO: The following logic relies on the unverified fact that -+ // `AuthPrompt::_onVerificationComplete` seems to always run after -+ // current handler. This might root from the interaction between -+ // greeter and verifier, both are external programs. -+ this._authPrompt.verificationStatus = AuthPrompt.AuthPromptStatus.VERIFIED_BUT_FORBIDDEN; -+ this._authPrompt.cancelButton.reactive = true; -+ -+ // NOTE: Failed Attempts as references -+ // -+ // NOTE: reset is too heavy, it skips the error prompt all together -+ // this._authPrompt.reset(); -+ // -+ // NOTE: Diconnect at this stage is not working -+ // -+ // this._authPrompt._userVerifier.disconnect(this._authPrompt._userVerifierCompleteId); -+ -+ return; -+ } -+ - this._authPrompt.finish(() => this._startSession(serviceName)); - } -