8afe1f3d8a
Sync with SLE-15-SP5. old: GNOME:Factory/gnome-shell new: home:xiaoguang_wang:branches:GNOME:Factory/gnome-shell rev None Index: gnome-shell.changes =================================================================== --- gnome-shell.changes (revision 556) +++ gnome-shell.changes (revision 2) @@ -375,6 +375,12 @@ + Updated translations. ------------------------------------------------------------------- +Tue Feb 7 01:17:47 UTC 2023 - Xiaoguang Wang <xiaoguang.wang@suse.com> + +- Update gs-fate318433-prevent-same-account-multi-logins.patch: + Fix no warning messages (bsc#1207323). + +------------------------------------------------------------------- Sat Dec 10 09:03:48 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> - Update to version 43.2: Index: gs-fate318433-prevent-same-account-multi-logins.patch =================================================================== --- gs-fate318433-prevent-same-account-multi-logins.patch (revision 556) +++ gs-fate318433-prevent-same-account-multi-logins.patch (revision 2) @@ -1,13 +1,13 @@ -Index: gnome-shell-41.3/js/gdm/loginDialog.js +Index: gnome-shell-41.9/js/gdm/loginDialog.js =================================================================== ---- gnome-shell-41.3.orig/js/gdm/loginDialog.js -+++ gnome-shell-41.3/js/gdm/loginDialog.js -@@ -1043,6 +1043,29 @@ var LoginDialog = GObject.registerClass( +--- 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(null, ++ 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 OBS-URL: https://build.opensuse.org/request/show/1131252 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=557
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
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));
|
|
}
|
|
|