SHA256
1
0
forked from pool/gnome-shell

Accepting request 1193509 from GNOME:Factory

- Drop gs-fate318433-prevent-same-account-multi-logins.patch.
  Upstream now does this. (forwarded request 1193496 from mgorse)

OBS-URL: https://build.opensuse.org/request/show/1193509
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=260
This commit is contained in:
Dominique Leuenberger 2024-08-14 12:14:13 +00:00 committed by Git OBS Bridge
commit 0381b712d3
3 changed files with 6 additions and 37 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Aug 12 17:28:18 UTC 2024 - Michael Gorse <mgorse@suse.com>
- Drop gs-fate318433-prevent-same-account-multi-logins.patch.
Upstream now does this.
-------------------------------------------------------------------
Thu Aug 8 20:16:23 UTC 2024 - Michael Gorse <mgorse@suse.com>

View File

@ -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

View File

@ -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));
}