pool/gnome-shell
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 942957 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/942957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=214
This commit is contained in:
Dominique Leuenberger 2021-12-30 14:55:19 +00:00 committed by Git OBS Bridge
commit dd3ea8cac1
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnome-shell.changes
View File

@ -10,6 +10,13 @@ Fri Dec 17 04:09:17 UTC 2021 - QK ZHU <qkzhu@suse.com>
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/648 https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/648
(bsc#1190878 glgo#GNOME/gnome-shell#4344). (bsc#1190878 glgo#GNOME/gnome-shell#4344).
-------------------------------------------------------------------
Wed Dec 15 01:22:29 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gs-fate318433-prevent-same-account-multi-logins.patch:
Show message "Multiple logins are not supported" when mixed
locally/remotely login(bsc#1190745).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 13 16:07:50 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com> Mon Dec 13 16:07:50 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

29
gs-fate318433-prevent-same-account-multi-logins.patch
View File

@ -1,7 +1,7 @@
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js Index: gnome-shell-41.2/js/gdm/authPrompt.js
index 7a4a0d3..e5749d6 100644 ===================================================================
--- a/js/gdm/authPrompt.js --- gnome-shell-41.2.orig/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js +++ gnome-shell-41.2/js/gdm/authPrompt.js
@@ -31,6 +31,8 @@ var AuthPromptStatus = { @@ -31,6 +31,8 @@ var AuthPromptStatus = {
VERIFICATION_SUCCEEDED: 3, VERIFICATION_SUCCEEDED: 3,
VERIFICATION_CANCELLED: 4, VERIFICATION_CANCELLED: 4,
@ -11,7 +11,7 @@ index 7a4a0d3..e5749d6 100644
}; };
var BeginRequestType = { var BeginRequestType = {
@@ -292,7 +294,12 @@ var AuthPrompt = GObject.registerClass({ @@ -338,7 +340,13 @@ var AuthPrompt = GObject.registerClass({
} }
_onVerificationComplete() { _onVerificationComplete() {
@ -19,16 +19,17 @@ index 7a4a0d3..e5749d6 100644
this.setActorInDefaultButtonWell(null); this.setActorInDefaultButtonWell(null);
+ +
+ if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) { + if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) {
+ this.cancelButton.reactive = true;
+ return; + return;
+ } + }
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED; this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false; this.cancelButton.reactive = false;
this.cancelButton.can_focus = false; this.cancelButton.can_focus = false;
diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js Index: gnome-shell-41.2/js/gdm/loginDialog.js
index 3f01ca0..0f5e64c 100644 ===================================================================
--- a/js/gdm/loginDialog.js --- gnome-shell-41.2.orig/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js +++ gnome-shell-41.2/js/gdm/loginDialog.js
@@ -949,6 +949,8 @@ var LoginDialog = GObject.registerClass({ @@ -952,6 +952,8 @@ var LoginDialog = GObject.registerClass(
this._authPrompt.updateSensitivity(false); this._authPrompt.updateSensitivity(false);
let answer = this._authPrompt.getAnswer(); let answer = this._authPrompt.getAnswer();
this._user = this._userManager.get_user(answer); this._user = this._userManager.get_user(answer);
@ -37,7 +38,7 @@ index 3f01ca0..0f5e64c 100644
this._authPrompt.clear(); this._authPrompt.clear();
this._authPrompt.begin({ userName: answer }); this._authPrompt.begin({ userName: answer });
this._updateCancelButton(); this._updateCancelButton();
@@ -1014,6 +1016,8 @@ var LoginDialog = GObject.registerClass({ @@ -1017,6 +1019,8 @@ var LoginDialog = GObject.registerClass(
let answer = this._authPrompt.getAnswer(); let answer = this._authPrompt.getAnswer();
let domain_answer = this._domainMenuButton.getDomainUser(answer); let domain_answer = this._domainMenuButton.getDomainUser(answer);
this._user = this._userManager.get_user(domain_answer); this._user = this._userManager.get_user(domain_answer);
@ -46,11 +47,11 @@ index 3f01ca0..0f5e64c 100644
this._authPrompt.clear(); this._authPrompt.clear();
this._authPrompt.startSpinning(); this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: domain_answer}); this._authPrompt.begin({ userName: domain_answer});
@@ -1040,6 +1044,28 @@ var LoginDialog = GObject.registerClass({ @@ -1043,6 +1047,28 @@ var LoginDialog = GObject.registerClass(
} }
_onSessionOpened(client, serviceName) { _onSessionOpened(client, serviceName) {
+ if ( this._userLoginForbidden ) { + if (this._user.is_x_logged_in_remotely()) {
+ this._authPrompt.setMessage( + this._authPrompt.setMessage(
+ _('Sorry, you have to log out a previous session first. Multiple logins are not supported.'), + _('Sorry, you have to log out a previous session first. Multiple logins are not supported.'),
+ GdmUtil.MessageType.ERROR); + GdmUtil.MessageType.ERROR);
@ -75,7 +76,7 @@ index 3f01ca0..0f5e64c 100644
this._authPrompt.finish(() => this._startSession(serviceName)); this._authPrompt.finish(() => this._startSession(serviceName));
} }
@@ -1217,6 +1243,7 @@ var LoginDialog = GObject.registerClass({ @@ -1238,6 +1264,7 @@ var LoginDialog = GObject.registerClass(
_onUserListActivated(activatedItem) { _onUserListActivated(activatedItem) {
this._user = activatedItem.user; this._user = activatedItem.user;