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

Accepting request 735063 from GNOME:Next

Browse Source 
Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/735063
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=397
This commit is contained in:
Bjørn Lie 2019-10-04 15:46:38 +00:00 committed by Git OBS Bridge
parent 53f8941775
commit 47450aae3c
15 changed files with 420 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -2,7 +2,7 @@
<service name="obs_scm" mode="disabled" >
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="scm">git</param>
<param name="revision">gnome-3-32</param>
<param name="revision">506b75fc</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="changesgenerate">enable</param>
</service>

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-shell.git</param>
<param name="changesrevision">1c6abf37855cd4f834569b6db32d32c1d8876f2a</param></service></servicedata>
<param name="changesrevision">506b75fc7f3a1beeee6141ccb8edb6731c45cc6a</param></service></servicedata>

37
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
View File

@ -1,33 +1,30 @@
Index: gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml
===================================================================
--- gnome-shell-3.26.0.orig/data/gnome-shell-theme.gresource.xml
+++ gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml
@@ -38,5 +38,6 @@
diff -urp gnome-shell-3.33.91.orig/data/gnome-shell-theme.gresource.xml gnome-shell-3.33.91/data/gnome-shell-theme.gresource.xml
--- gnome-shell-3.33.91.orig/data/gnome-shell-theme.gresource.xml 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/data/gnome-shell-theme.gresource.xml 2019-09-04 15:20:19.511263425 -0500
@@ -31,5 +31,6 @@
<file>toggle-on.svg</file>
<file>toggle-on-dark.svg</file>
<file>toggle-on-hc.svg</file>
<file>ws-switch-arrow-up.png</file>
<file>ws-switch-arrow-down.png</file>
+ <file>sle-background.png</file>
</gresource>
</gresources>
Index: gnome-shell-3.26.0/data/theme/gnome-shell.css
===================================================================
--- gnome-shell-3.26.0.orig/data/theme/gnome-shell.css
+++ gnome-shell-3.26.0/data/theme/gnome-shell.css
@@ -1599,6 +1599,9 @@ StScrollBar {
padding-top: 24px;
max-width: 23em; }
diff -urp gnome-shell-3.33.91.orig/data/theme/gnome-shell-sass/_common.scss gnome-shell-3.33.91/data/theme/gnome-shell-sass/_common.scss
--- gnome-shell-3.33.91.orig/data/theme/gnome-shell-sass/_common.scss 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/data/theme/gnome-shell-sass/_common.scss 2019-09-04 15:22:50.500063729 -0500
@@ -1912,6 +1912,9 @@ StScrollBar {
max-width: 23em;
}
+.login-dialog-sle {
+ background: #2e3436 url(sle-background.png); }
+
.login-dialog {
//reset
border: none;
background-color: transparent; }
Index: gnome-shell-3.26.0/js/ui/unlockDialog.js
===================================================================
--- gnome-shell-3.26.0.orig/js/ui/unlockDialog.js
+++ gnome-shell-3.26.0/js/ui/unlockDialog.js
@@ -37,6 +37,7 @@ var UnlockDialog = new Lang.Class({
diff -urp gnome-shell-3.33.91.orig/js/ui/unlockDialog.js gnome-shell-3.33.91/js/ui/unlockDialog.js
--- gnome-shell-3.33.91.orig/js/ui/unlockDialog.js 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/ui/unlockDialog.js 2019-09-04 15:24:01.072437800 -0500
@@ -20,6 +20,7 @@ var UnlockDialog = class {
layout_manager: new Clutter.BoxLayout(),
visible: false });

3
gnome-shell-3.32.2+11.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75fa143797a57bc9602679454baad1869a8c057dea024673f5650443f639b1fd
size 11741709

3
gnome-shell-3.34.0+148.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddfda2786287b0bf090ca20662a35ba029a7738e37be959b6f1a3005722bd0d3
size 12383245

38
gnome-shell-864872-unlock-by-mouse-motion.patch
View File

@ -1,30 +1,30 @@
Index: gnome-shell-3.24.2/js/ui/screenShield.js
===================================================================
--- gnome-shell-3.24.2.orig/js/ui/screenShield.js
+++ gnome-shell-3.24.2/js/ui/screenShield.js
@@ -438,6 +438,8 @@ const ScreenShield = new Lang.Class({
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 7b154f2..ff7315d 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -431,6 +431,8 @@ var ScreenShield = class {
this.actor = Main.layoutManager.screenShieldGroup;
this._lockScreenState = MessageTray.State.HIDDEN;
+ this._last_x = -1;
+ this._last_y = -1;
this._lockScreenGroup = new St.Widget({ x_expand: true,
y_expand: true,
reactive: true,
@@ -447,6 +449,8 @@ const ScreenShield = new Lang.Class({
});
this._lockScreenGroup = new St.Widget({
x_expand: true,
y_expand: true,
@@ -441,6 +443,8 @@ var ScreenShield = class {
});
this._lockScreenGroup.connect('key-press-event',
Lang.bind(this, this._onLockScreenKeyPress));
this._onLockScreenKeyPress.bind(this));
+ this._lockScreenGroup.connect('motion-event',
+ Lang.bind(this, this._onLockScreenMotion));
+ this._onLockScreenMotion.bind(this));
this._lockScreenGroup.connect('scroll-event',
Lang.bind(this, this._onLockScreenScroll));
this._onLockScreenScroll.bind(this));
Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic');
@@ -686,6 +690,25 @@ const ScreenShield = new Lang.Class({
@@ -720,6 +724,25 @@ var ScreenShield = class {
return Clutter.EVENT_STOP;
},
}
+ _onLockScreenMotion: function(actor, event) {
+ _onLockScreenMotion(actor, event) {
+ if (this._lockScreenState != MessageTray.State.SHOWN)
+ return false;
+ let [X, Y] = event.get_coords();
@ -41,12 +41,12 @@ Index: gnome-shell-3.24.2/js/ui/screenShield.js
+ if (distance >= min_distance)
+ this._liftShield(true, 0);
+ return true;
+ },
+ }
+
_onLockScreenScroll: function(actor, event) {
_onLockScreenScroll(actor, event) {
if (this._lockScreenState != MessageTray.State.SHOWN)
return Clutter.EVENT_PROPAGATE;
@@ -1005,6 +1028,8 @@ const ScreenShield = new Lang.Class({
@@ -1036,6 +1059,8 @@ var ScreenShield = class {
return;
this._ensureLockScreen();

80
gnome-shell-domain.patch
View File

@ -1,7 +1,6 @@
Index: gnome-shell-3.26.0/js/gdm/domain.js
===================================================================
--- /dev/null
+++ gnome-shell-3.26.0/js/gdm/domain.js
diff -urNp gnome-shell-3.33.91.orig/js/gdm/domain.js gnome-shell-3.33.91/js/gdm/domain.js
--- gnome-shell-3.33.91.orig/js/gdm/domain.js 1969-12-31 18:00:00.000000000 -0600
+++ gnome-shell-3.33.91/js/gdm/domain.js 2019-09-04 10:22:42.476273775 -0500
@@ -0,0 +1,243 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/*
@ -246,21 +245,20 @@ Index: gnome-shell-3.26.0/js/gdm/domain.js
+ }
+});
+Signals.addSignalMethods(DomainMenuButton.prototype);
Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
===================================================================
--- gnome-shell-3.26.0.orig/js/gdm/loginDialog.js
+++ gnome-shell-3.26.0/js/gdm/loginDialog.js
@@ -33,6 +33,7 @@ const Signals = imports.signals;
const St = imports.gi.St;
diff -urNp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/gdm/loginDialog.js
--- gnome-shell-3.33.91.orig/js/gdm/loginDialog.js 2019-09-04 10:05:51.598915194 -0500
+++ gnome-shell-3.33.91/js/gdm/loginDialog.js 2019-09-04 12:52:15.396169384 -0500
@@ -22,6 +22,7 @@ const { AccountsService, Atk, Clutter, G
const Signals = imports.signals;
const AuthPrompt = imports.gdm.authPrompt;
+const Domain = imports.gdm.domain;
const Batch = imports.gdm.batch;
const BoxPointer = imports.ui.boxpointer;
const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -452,6 +453,14 @@ var LoginDialog = new Lang.Class({
@@ -437,6 +438,14 @@ var LoginDialog = GObject.registerClass(
this._authPrompt.hide();
this.actor.add_child(this._authPrompt.actor);
this.add_child(this._authPrompt.actor);
+ this._userLayout = new St.BoxLayout({ vertical: false,
+ x_expand: true
@ -273,7 +271,7 @@ Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
// translators: this message is shown below the user list on the
// login screen. It can be activated to reveal an entry for
// manually entering the username.
@@ -469,10 +478,24 @@ var LoginDialog = new Lang.Class({
@@ -454,10 +463,24 @@ var LoginDialog = GObject.registerClass(
this._notListedButton.hide();
@ -300,11 +298,11 @@ Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
opacity: 0,
@@ -948,6 +971,37 @@ var LoginDialog = new Lang.Class({
}));
},
@@ -942,6 +965,37 @@ var LoginDialog = GObject.registerClass(
});
}
+ _askForDomainUsernameAndBeginVerification: function(domain) {
+ _askForDomainUsernameAndBeginVerification(domain) {
+ this._authPrompt.setPasswordChar('');
+ this._authPrompt.setQuestion(this._domainMenuButton.getQuestionMessage());
+
@ -335,22 +333,22 @@ Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
+ this._showPrompt();
+ },
+
_startSession: function(serviceName) {
Tweener.addTween(this.actor,
{ opacity: 0,
@@ -1116,6 +1170,11 @@ var LoginDialog = new Lang.Class({
_startSession(serviceName) {
this._bindOpacity();
this.actor.ease({
@@ -1099,6 +1153,11 @@ var LoginDialog = GObject.registerClass(
this._askForUsernameAndBeginVerification();
},
}
+ _hideUserListAskForDomainUsernameAndBeginVerification: function() {
+ _hideUserListAskForDomainUsernameAndBeginVerification() {
+ this._hideUserList();
+ this._askForDomainUsernameAndBeginVerification();
+ },
+
_hideUserListAndBeginVerification: function() {
_hideUserListAndBeginVerification() {
this._hideUserList();
this._authPrompt.begin();
@@ -1128,6 +1187,9 @@ var LoginDialog = new Lang.Class({
@@ -1111,6 +1170,9 @@ var LoginDialog = GObject.registerClass(
this._sessionMenuButton.close();
this._setUserListExpanded(true);
this._notListedButton.show();
@ -359,23 +357,10 @@ Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
+ this._userLayout.show();
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
+++ gnome-shell-3.26.0/po/POTFILES.in
@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/main.js
js/gdm/authPrompt.js
+js/gdm/domain.js
js/gdm/loginDialog.js
js/gdm/util.js
js/misc/systemActions.js
Index: gnome-shell-3.26.0/js/js-resources.gresource.xml
===================================================================
--- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.26.0/js/js-resources.gresource.xml
}
diff -urNp gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.33.91/js/js-resources.gresource.xml
--- gnome-shell-3.33.91.orig/js/js-resources.gresource.xml 2019-09-04 10:21:23.651855885 -0500
+++ gnome-shell-3.33.91/js/js-resources.gresource.xml 2019-09-04 12:52:22.840208842 -0500
@@ -2,6 +2,7 @@
<gresources>
<gresource prefix="/org/gnome/shell">
@ -384,3 +369,14 @@ Index: gnome-shell-3.26.0/js/js-resources.gresource.xml
<file>gdm/batch.js</file>
<file>gdm/fingerprint.js</file>
<file>gdm/loginDialog.js</file>
diff -urNp gnome-shell-3.33.91.orig/po/POTFILES.in gnome-shell-3.33.91/po/POTFILES.in
--- gnome-shell-3.33.91.orig/po/POTFILES.in 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/po/POTFILES.in 2019-09-04 12:52:22.840208842 -0500
@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/main.js
js/gdm/authPrompt.js
+js/gdm/domain.js
js/gdm/loginDialog.js
js/gdm/util.js
js/misc/systemActions.js

52
gnome-shell-gdm-login-applet.patch
View File

@ -1,19 +1,17 @@
Index: gnome-shell-3.26.0/js/js-resources.gresource.xml
===================================================================
--- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.26.0/js/js-resources.gresource.xml
@@ -34,6 +34,7 @@
<file>portalHelper/main.js</file>
diff -urpN gnome-shell-3.33.91.orig/js/js-resources.gresource.xml gnome-shell-3.33.91/js/js-resources.gresource.xml
--- gnome-shell-3.33.91.orig/js/js-resources.gresource.xml 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/js-resources.gresource.xml 2019-09-04 10:15:21.233934725 -0500
@@ -32,6 +32,7 @@
<file>perf/core.js</file>
<file>perf/hwtest.js</file>
+ <file>ui/aboutMenu.js</file>
<file>ui/accessDialog.js</file>
<file>ui/altTab.js</file>
<file>ui/animation.js</file>
Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
===================================================================
--- /dev/null
+++ gnome-shell-3.26.0/js/ui/aboutMenu.js
diff -urpN gnome-shell-3.33.91.orig/js/ui/aboutMenu.js gnome-shell-3.33.91/js/ui/aboutMenu.js
--- gnome-shell-3.33.91.orig/js/ui/aboutMenu.js 1969-12-31 18:00:00.000000000 -0600
+++ gnome-shell-3.33.91/js/ui/aboutMenu.js 2019-09-04 10:15:40.562037171 -0500
@@ -0,0 +1,150 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
@ -29,7 +27,7 @@ Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
+const AboutMenuButton = new Lang.Class({
+ Name: 'AboutMenuButton',
+ Extends: PanelMenu.Button,
+ _init: function() {
+ _init() {
+ this._hostname = null;
+ this._updateHostnameId = 0;
+ this._ticket = 1;
@ -95,7 +93,7 @@ Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
+ return;
+ },
+
+ _updateHostname: function(){
+ _updateHostname(){
+ let hostname_text = get_hostname();
+
+ if ((this._hostname == null) || (this._hostname != hostname_text)) {
@ -115,7 +113,7 @@ Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
+ }));
+ },
+
+ _destroy: function() {
+ _destroy() {
+ this._ticket = 1;
+ if (this._updateHostnameId) {
+ GLib.source_remove (this._updateHostnameId);
@ -165,11 +163,10 @@ Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
+
+ return hostname;
+}
Index: gnome-shell-3.26.0/js/ui/panel.js
===================================================================
--- gnome-shell-3.26.0.orig/js/ui/panel.js
+++ gnome-shell-3.26.0/js/ui/panel.js
@@ -758,6 +758,7 @@ var AggregateMenu = new Lang.Class({
diff -urpN gnome-shell-3.33.91.orig/js/ui/panel.js gnome-shell-3.33.91/js/ui/panel.js
--- gnome-shell-3.33.91.orig/js/ui/panel.js 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/ui/panel.js 2019-09-04 10:15:40.562037171 -0500
@@ -769,6 +769,7 @@ class AggregateMenu extends PanelMenu.Bu
});
const PANEL_ITEM_IMPLEMENTATIONS = {
@ -177,16 +174,15 @@ Index: gnome-shell-3.26.0/js/ui/panel.js
'activities': ActivitiesButton,
'aggregateMenu': AggregateMenu,
'appMenu': AppMenuButton,
Index: gnome-shell-3.26.0/js/ui/sessionMode.js
===================================================================
--- gnome-shell-3.26.0.orig/js/ui/sessionMode.js
+++ gnome-shell-3.26.0/js/ui/sessionMode.js
@@ -47,7 +47,7 @@ const _modes = {
unlockDialog: imports.gdm.loginDialog.LoginDialog,
components: ['polkitAgent'],
diff -urpN gnome-shell-3.33.91.orig/js/ui/sessionMode.js gnome-shell-3.33.91/js/ui/sessionMode.js
--- gnome-shell-3.33.91.orig/js/ui/sessionMode.js 2019-08-21 15:00:39.000000000 -0500
+++ gnome-shell-3.33.91/js/ui/sessionMode.js 2019-09-04 10:18:12.262841288 -0500
@@ -33,7 +33,7 @@ const _modes = {
unlockDialog: null,
components: [],
panel: {
- left: [],
+ left: ['aboutMenu'],
center: ['dateMenu'],
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
center: [],
right: []
},

18
gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index f51eb7b..5abad41 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -327,11 +327,11 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
this._inhibitorSection.add_actor(this._applicationList);
this._sessionHeader = new St.Label({ style_class: 'end-session-dialog-list-header',
- text: _("Other users are logged in.") });
+ text: _("Other users are logged in. You can list these users by 'who' command.") });
this._sessionList = new St.BoxLayout({ style_class: 'end-session-dialog-session-list',
vertical: true });
this._inhibitorSection.add_actor(this._sessionHeader);
- this._inhibitorSection.add_actor(this._sessionList);
+ //this._inhibitorSection.add_actor(this._sessionList); Hide _sessionList for jsc#SLE-9267
this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this);
this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog');

18
gnome-shell-lock-bg-on-primary.patch
View File

@ -1,14 +1,18 @@
Index: gnome-shell-3.24.2/js/ui/screenShield.js
===================================================================
--- gnome-shell-3.24.2.orig/js/ui/screenShield.js
+++ gnome-shell-3.24.2/js/ui/screenShield.js
@@ -498,9 +498,31 @@ const ScreenShield = new Lang.Class({
diff -urp gnome-shell-3.33.91.orig/js/ui/screenShield.js gnome-shell-3.33.91/js/ui/screenShield.js
--- gnome-shell-3.33.91.orig/js/ui/screenShield.js 2019-09-04 14:04:13.523059437 -0500
+++ gnome-shell-3.33.91/js/ui/screenShield.js 2019-09-04 14:20:01.448084179 -0500
@@ -492,7 +492,7 @@ var ScreenShield = class {
y_expand: true,
reactive: true,
pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
- name: 'lockDialogGroup' });
+ name: 'lockDialogGroupReal' });
// Add background for this._lockDialogGroup
this._bgLockDialogGroup = new Clutter.Actor();
@@ -505,6 +505,28 @@ var ScreenShield = class {
Main.layoutManager.connect('monitors-changed', this._updateBgLockDialogGroup.bind(this));
this.actor.add_actor(this._lockDialogGroup);
+
+ let primaryBackground = new St.Widget({ x_expand: true,
@ -17,7 +21,7 @@ Index: gnome-shell-3.24.2/js/ui/screenShield.js
+ pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }),
+ name: 'lockDialogGroup' });
+ primaryBackground.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+ this.actor.insert_child_below(primaryBackground, null);
++ this.actor.insert_child_below(primaryBackground, null);
+
+ for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
+ if (Main.layoutManager.monitors [i].index == Main.layoutManager.primaryMonitor.index)
@ -34,4 +38,4 @@ Index: gnome-shell-3.24.2/js/ui/screenShield.js
+
this.actor.add_actor(this._lockScreenGroup);
this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) {
this._presence = new GnomeSession.Presence((proxy, error) => {

63
gnome-shell-private-connection.patch
View File

@ -1,8 +1,7 @@
From 342795440012a216d4abb9cfb04d2c3bd0fe8f4d Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Thu, 31 Mar 2011 15:56:13 +0200
Subject: [PATCH] NetworkMenu: create private connections if the user is not
authorized
Subject: [PATCH] NetworkMenu: create private connections if the user is not authorized
Check polkit setting at startup and add, if needed, the "permissions"
setting to the connections we create, so that polkit authentication is
@ -14,18 +13,19 @@ https://bugzilla.gnome.org/show_bug.cgi?id=646187
js/ui/status/network.js | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 77a6202..8c08ef2 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1,5 +1,5 @@
Index: gnome-shell-3.34.0+94/js/ui/status/network.js
===================================================================
--- gnome-shell-3.34.0+94.orig/js/ui/status/network.js
+++ gnome-shell-3.34.0+94/js/ui/status/network.js
@@ -1,6 +1,6 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
/* exported NMApplet */
-const { Clutter, Gio, GLib, GObject, NM, St } = imports.gi;
+const { Clutter, Gio, GLib, GObject, NM, St, Polkit } = imports.gi;
const Mainloop = imports.mainloop;
const Signals = imports.signals;
@@ -322,6 +322,11 @@ var NMConnectionDevice = class extends NMConnectionSection {
const Animation = imports.ui.animation;
@@ -326,6 +326,11 @@ var NMConnectionDevice = class NMConnect
_autoConnect() {
let connection = new NM.SimpleConnection();
@ -33,11 +33,11 @@ index 77a6202..8c08ef2 100644
+ let connectionSetting = new NM.SettingConnection();
+ connectionSetting.add_permission('user', GLib.get_user_name(), null);
+ connection.add_setting(connectionSetting);
+ }
+ }
this._client.add_and_activate_connection_async(connection, this._device, null, null, null);
}
@@ -458,10 +463,11 @@ var NMConnectionDevice = class extends NMConnectionSection {
@@ -462,10 +467,11 @@ var NMConnectionDevice = class NMConnect
};
var NMDeviceWired = class extends NMConnectionDevice {
@ -50,13 +50,13 @@ index 77a6202..8c08ef2 100644
}
get category() {
@@ -672,11 +678,12 @@ var NMWirelessDialogItem = class {
Signals.addSignalMethods(NMWirelessDialogItem.prototype);
@@ -682,11 +688,12 @@ var NMWirelessDialogItem = GObject.regis
var NMWirelessDialog = class extends ModalDialog.ModalDialog {
- constructor(client, device) {
+ constructor(client, device, privateConnections) {
super({ styleClass: 'nm-dialog' });
var NMWirelessDialog = GObject.registerClass(
class NMWirelessDialog extends ModalDialog.ModalDialog {
- _init(client, device) {
+ _init(client, device, privateConnections) {
super._init({ styleClass: 'nm-dialog' });
this._client = client;
this._device = device;
@ -64,7 +64,7 @@ index 77a6202..8c08ef2 100644
this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled',
this._syncView.bind(this));
@@ -907,6 +914,11 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
@@ -917,6 +924,11 @@ class NMWirelessDialog extends ModalDial
this._device.get_path(), accessPoints[0].get_path()]);
} else {
let connection = new NM.SimpleConnection();
@ -73,11 +73,11 @@ index 77a6202..8c08ef2 100644
+ connectionSetting.add_permission('user', GLib.get_user_name(), null);
+ connection.add_setting(connectionSetting);
+ }
this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null)
this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null);
}
}
@@ -1142,9 +1154,10 @@ var NMWirelessDialog = class extends ModalDialog.ModalDialog {
};
@@ -1153,9 +1165,10 @@ class NMWirelessDialog extends ModalDial
});
var NMDeviceWireless = class {
- constructor(client, device) {
@ -88,7 +88,7 @@ index 77a6202..8c08ef2 100644
this._description = '';
@@ -1230,7 +1243,7 @@ var NMDeviceWireless = class {
@@ -1241,7 +1254,7 @@ var NMDeviceWireless = class {
}
_showDialog() {
@ -97,10 +97,11 @@ index 77a6202..8c08ef2 100644
this._dialog.connect('closed', this._dialogClosed.bind(this));
this._dialog.open();
}
@@ -1606,6 +1619,19 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
@@ -1616,6 +1629,19 @@ var NMApplet = class extends PanelMenu.S
_clientGot(obj, result) {
this._client = NM.Client.new_finish(result);
+
+ // Check if newly created connections should be private or not
+ this._privateConnections = true;
+ let authority = Polkit.Authority.get_sync(null);
@ -113,11 +114,10 @@ index 77a6202..8c08ef2 100644
+ null /* cancellable */);
+ if (authResult)
+ this._privateConnections = !authResult.get_is_authorized();
+
this._activeConnections = [ ];
this._connections = [ ];
this._connectivityQueue = [ ];
@@ -1721,7 +1747,7 @@ var NMApplet = class extends PanelMenu.SystemIndicator {
this._activeConnections = [];
this._connections = [];
@@ -1736,7 +1762,7 @@ var NMApplet = class extends PanelMenu.S
let wrapperClass = this._dtypes[device.get_device_type()];
if (wrapperClass) {
@ -125,7 +125,4 @@ index 77a6202..8c08ef2 100644
+ let wrapper = new wrapperClass(this._client, device, this._privateConnections);
device._delegate = wrapper;
this._addDeviceWrapper(wrapper);
--
2.16.4

187
gnome-shell.changes
View File

@ -1,3 +1,190 @@
-------------------------------------------------------------------
Sat Sep 21 17:10:28 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.34.0+148:
* shell-util: Do not scale the clip in get_content_for_window_actor()
* Update Galician translation
* screenShield: Stop using deprecated actor property
* unlockDialog: Use inheritance instead of composition
* loginDialog: Stop using deprecated actor property
* environment: Try harder to find a transition
* layout: Don't use the actors pick workaround on update regions
* renameFolderMenu: Use a custom menu item inheriting from PopupBaseMenuItem
* renameFolderMenu: Move to non-legacy coding style
* renameFolderMenu: Set the entry as menu focus actor
* popupMenu: Add focusActor property to define the default focus actor
* popupBaseMenuItem: Add support for Hidden Ornament
* renameFolderMenu: Don't save the source
* folderIcon: Remove duplicated addMenu call
* workspace: Fix an incorrect signal check
* appDisplay: Animate DnD app icons at the position they were dropped
* appDisplay: Add API to animate launch at given position
* workspace: Return results of forwarded acceptDrop
* overview: Only accept AppIcon drops if the app can open a new window
* shell-app: Never allow opening new windows while an app is starting
* workspace: Use AppIcon.app to check action-support by the drag source
* introspect: Check whitelist also for GetRunningWindows()
* st: Fix box-shadow drawing with prerendered_texture
* workspace: Remove unused properties of WindowClone
* viewSelector: Only reset search entry if it has key focus
* workspace: Reset idle hide timeout for overlays on reentry
* workspace: Make title of overlay reactive
* workspace: Continue overlay idle hide timeout when pointing at close button
* Update Norwegian Bokmål translation
* Update French translation
* Update French translation
-------------------------------------------------------------------
Tue Sep 17 09:11:28 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.34.0+117:
+ util: Handle trailing LTR/RTL markers in URLs
+ cleanup: Don't add linebreak before operators
+ cleanup: Disambiguate assignments in arrow functions
+ cleanup: Remove trailing spaces
+ cleanup: Fix up "special" comments
+ cleanup: Use consistent brace style of blocks
+ cleanup: Avoid pointless "renames" in destructuring
+ cleanup: Avoid unnecessary parentheses in arrow functions
+ cleanup: Avoid useless return statements
+ cleanup: Don't use Array/Object constructors
-------------------------------------------------------------------
Tue Sep 17 06:58:17 UTC 2019 - Chingkai Chu <qkzhu@suse.com>
- Rebase gnome-shell-864872-unlock-by-mouse-motion.patch to 3.34.
-------------------------------------------------------------------
Fri Sep 13 14:29:24 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.34.0+94:
+ lookingGlass: Only update window list when visible
+ ci: Disable MR handling for now
+ ci: Disallow legacy style in merge requests
* ci: Fail on any common lint errors
+ cleanup: Don't assume hasOwnProperty() method on objects
+ cleanup: "Only" use two indentation styles for object literals
+ cleanup: Stop using Mainloop module
- Switch to checkout from master, we need the fixes for stability.
- Drop gnome-shell-remove-the-INITIALIZED-extensionState.patch:
Fixed upstream.
-------------------------------------------------------------------
Thu Sep 12 15:32:19 UTC 2019 - Dead Mozay <dead_mozay@opensuse.org>
- Add gnome-shell-remove-the-INITIALIZED-extensionState.patch:
Completely remove the INITIALIZED ExtensionState
-------------------------------------------------------------------
Mon Sep 9 16:31:37 CDT 2019 - mgorse@suse.com
- Update to version 3.34.0:
+ Handle startup/shutdown of misc X11 services.
+ Fix sound volume mute/unmute.
+ Correctly terminate pasted text.
+ Updated translations.
-------------------------------------------------------------------
Mon Sep 9 09:14:13 UTC 2019 - Chingkai Chu <qkzhu@suse.com>
- Add gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch:
Remove sessionList of endSessionDialog for security reasons
(jsc#SLE-9267).
-------------------------------------------------------------------
Sat Sep 7 20:02:51 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Fixup _service to follow our standards.
-------------------------------------------------------------------
Thu Sep 5 16:00:43 UTC 2019 - Michael Gorse <mgorse@suse.com>
- Rebase SLE patches and modernize syntax in a few cases:
gnome-shell-gdm-login-applet.patch
gnome-shell-domain.patch
gnome-shell-864872-unlock-by-mouse-motion.patch
gnome-shell-lock-bg-on-primary.patch
gs-fate318433-prevent-same-account-multi-logins.patch
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
-------------------------------------------------------------------
Wed Sep 4 23:48:23 UTC 2019 - Luke Jones <luke@ljones.dev>
- Update to version 3.33.92
+ Animate pointer a11y pie timer.
+ Fix restarting shell in systemd user session.
+ Misc. bug fixes and cleanups.
-------------------------------------------------------------------
Tue Sep 3 01:40:52 UTC 2019 - Luke Jones <luke@ljones.dev>
- Update to version 3.33.91
+ Fix regression when adjusting brightness.
+ Fix pointer a11y timeout animation.
+ Add new extensions CLI tool.
+ Only track top-level windows.
+ Misc. bug fixes and cleanups.
+ Re-apply gnome-shell-private-connection.patch
- Changes from version 3.33.90
+ Implement DND app picker folder management.
+ Make Clocks/Weather integration work with sandboxed apps.
+ Support startup via systemd user instance.
+ Replace Tweener with Clutter animations.
+ Minimize travel distance in overview animation.
+ Rescan icon theme when installed apps changed.
+ Consistently animate new window actions.
+ Misc. bug fixes and cleanups.
- Changes from version 3.33.4
+ Fix unintentional interference between gestures.
+ Fix unintentional loop while polkit dialog is active.
+ Fix alt-tab icon size on HiDPI.
+ Style fixes and improvements.
+ Fix style updates for non-background CSS properties.
+ Fix cursor visibility in screen recordings.
+ Add option for disabling the hot corner.
+ Use more fine-grained levels in battery indicator.
+ Fix the calculation of the maximum number of app search
results.
+ Handle horizontal workspace layout with gestures/animations.
+ Improve handling of session mode extensions.
+ Misc. bug fixes and cleanups.
- Changes from version 3.33.3
+ Prepare for optional X11.
+ Fix opening window menu.
+ Reload search providers when installed applications change.
+ Implement locate-pointer accessibility feature.
+ Allow to disable window menus via session mode.
+ Implement mouse accessibility.
+ Call GDM's RegisterSession() after startup.
+ Fix extended keys popups being hidden by on-screen keyboard.
+ Fix top bar being hidden by lock screen.
+ Update theme to better match GTK's Adwaita.
+ Set up GJS profiler when GJS_TRACE_FD is set.
+ Misc. bug fixes and cleanups.
- Changes from version 3.33.2
+ Fix keeping actors visible in scrollviews.
+ Move some chrome above popup windows.
+ Include 'sandboxed-app-id' in winodw introspection info.
+ Port to libecal-2.0.
+ Support TCRYPT in mount password dialog.
+ Misc. bug fixes and cleanups.
- Changes from version 3.33.1
+ Refine the app menu.
+ Refine window preview style.
+ Only emit ::style-changed on actual changes.
+ Disable emoji on-screen keyboard support on X11.
+ Fix tablet button mapping overlay.
+ Don't crash for world clock locations with no timezone.
+ Don't leak old on-screen keyboard layout groups.
+ Fix ellipsization in dialog subtitles/bodies.
+ Fix glitch of fullscreen window in workspace switch animation.
+ Fix distortion of some image contents.
+ Allow dragging unfocused tiled/maximized windows from top bar.
+ Handle network interface name changes.
+ Avoid unnecessary style changes when computing
:first/:last-child.
+ Misc. bug fixes and cleanups.
-------------------------------------------------------------------
Wed Jul 24 20:55:12 UTC 2019 - bjorn.lie@gmail.com

6
gnome-shell.obsinfo
View File

@ -1,5 +1,5 @@
name: gnome-shell
version: 3.32.2+11
mtime: 1563954838
commit: 1c6abf37855cd4f834569b6db32d32c1d8876f2a
version: 3.34.0+148
mtime: 1569000454
commit: 506b75fc7f3a1beeee6141ccb8edb6731c45cc6a

32
gnome-shell.spec
View File

@ -19,31 +19,32 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell
Version: 3.32.2+11
Version: 3.34.0+148
Release: 0
Summary: GNOME Shell
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://wiki.gnome.org/Projects/GnomeShell
# We are using source services, so no download url for source
Source: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
Source1: aboutMenu.js
# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme
Source2: sle-background.png
# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized
Patch1: gnome-shell-private-connection.patch
# PATCH-FIX-OPENSUSE gnome-shell-disable-ibus-when-not-installed.patch bsc#987360 qzhao@suse.com -- disable ibus start when outof Chinese, Japanese, Korean area
Patch2: gnome-shell-disable-ibus-when-not-installed.patch
# PATCH-FIX-UPSTREAM gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch bsc#1058521 bgo#788169 xwang@suse.com -- Avoid login dialog grabs focus when screen locked
Patch3: gnome-shell-Avoid-loginDialog-grab-focus-when-locked.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-fate324570-Make-GDM-background-image-configurable.patch fate#324570, glgo#GNOME/gnome-shell#680 qkzhu@suse.com -- make GDM background image configurable
Patch4: gnome-shell-fate324570-Make-GDM-background-image-configurable.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch jsc#SLE-9267 qkzhu@suse.com -- Remove sessionList of endSessionDialog
Patch5: gnome-shell-jscSLE9267-Remove-sessionList-of-endSessionDialog.patch
## NOTE: Keep SLE-only patches at bottom (starting on 1000).
# PATCH-FEATURE-SLE gnome-shell-gdm-login-applet.patch fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
Patch1001: gnome-shell-gdm-login-applet.patch
# PATCH-FEATURE-SLE gnome-shell-domain.patch fate#307773 dliang@suse.com -- Active Directory Integration
Patch1002: gnome-shell-domain.patch
@ -61,6 +62,7 @@ Patch1007: gs-fate318433-prevent-same-account-multi-logins.patch
Patch1008: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
# needed for directory ownership
BuildRequires: asciidoc
BuildRequires: dbus-1
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
@ -77,7 +79,8 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0)
BuildRequires: pkgconfig(gdk-x11-3.0)
BuildRequires: pkgconfig(gio-2.0) >= 2.56.0
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.56.0
BuildRequires: pkgconfig(gjs-1.0) >= 1.47.0
BuildRequires: pkgconfig(gjs-1.0) >= 1.57.3
BuildRequires: pkgconfig(gnome-autoar-0)
BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.9.0
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.7.90
BuildRequires: pkgconfig(gnome-keybindings)
@ -92,10 +95,10 @@ BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.2
BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
BuildRequires: pkgconfig(libecal-1.2) >= 3.5.3
BuildRequires: pkgconfig(libecal-2.0) >= 3.5.3
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.17.2
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
BuildRequires: pkgconfig(libmutter-4) >= 3.32.2
BuildRequires: pkgconfig(libmutter-5) >= 3.33.92
BuildRequires: pkgconfig(libnm) >= 1.10.4
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib)
@ -104,9 +107,9 @@ BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mutter-clutter-4) >= 3.32.0
BuildRequires: pkgconfig(mutter-cogl-4) >= 3.32.0
BuildRequires: pkgconfig(mutter-cogl-pango-4) >= 3.32.0
BuildRequires: pkgconfig(mutter-clutter-5) >= 3.33.92
BuildRequires: pkgconfig(mutter-cogl-5) >= 3.33.92
BuildRequires: pkgconfig(mutter-cogl-pango-5) >= 3.33.92
BuildRequires: pkgconfig(polkit-agent-1) >= 0.100
BuildRequires: pkgconfig(x11)
BuildRequires: python(abi) >= 3
@ -169,6 +172,7 @@ into GNOME Shell calendar.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
translation-update-upstream
@ -213,6 +217,7 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes
%license COPYING
%doc README.md NEWS
%{_bindir}/gnome-shell
%{_bindir}/gnome-extensions
%{_bindir}/gnome-shell-extension-prefs
%dir %{_libdir}/gnome-shell
%dir %{_libexecdir}/gnome-shell
@ -254,12 +259,15 @@ install -d %{buildroot}%{_datadir}/gnome-shell/modes
%{_datadir}/gnome-shell/gnome-shell-osk-layouts.gresource
%{_datadir}/gnome-shell/perf-background.xml
%{_mandir}/man?/gnome-shell.?%{ext_man}
%{_mandir}/man?/gnome-extensions.?%{ext_man}
%dir %{_datadir}/xdg-desktop-portal
%dir %{_datadir}/xdg-desktop-portal/portals
%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
%{_userunitdir}/gnome-shell-wayland.target
%{_userunitdir}/gnome-shell-x11.target
%{_userunitdir}/gnome-shell.service
%{_userunitdir}/gnome-shell-wayland.service
%{_userunitdir}/gnome-shell-x11.service
%{_userunitdir}/gnome-shell-disable-extensions.service
%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
%{_libexecdir}/gnome-shell/gnome-shell-overrides-migration.sh
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override

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

@ -1,17 +1,43 @@
Index: gnome-shell-3.25.4/js/gdm/loginDialog.js
===================================================================
--- gnome-shell-3.25.4.orig/js/gdm/loginDialog.js
+++ gnome-shell-3.25.4/js/gdm/loginDialog.js
@@ -926,6 +926,8 @@ var LoginDialog = new Lang.Class({
this._authPrompt.updateSensitivity(false);
let answer = this._authPrompt.getAnswer();
this._user = this._userManager.get_user(answer);
+ this._userLoginForbidden =
+ this._user.is_x_logged_in_remotely();
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: answer });
@@ -990,6 +992,8 @@ var LoginDialog = new Lang.Class({
diff -urp gnome-shell-3.33.91.orig/js/gdm/authPrompt.js gnome-shell-3.33.91/js/gdm/authPrompt.js
--- gnome-shell-3.33.91.orig/js/gdm/authPrompt.js 2019-09-04 13:36:37.170279229 -0500
+++ gnome-shell-3.33.91/js/gdm/authPrompt.js 2019-09-04 15:11:35.568485953 -0500
@@ -25,7 +25,9 @@ var AuthPromptStatus = {
NOT_VERIFYING: 0,
VERIFYING: 1,
VERIFICATION_FAILED: 2,
- VERIFICATION_SUCCEEDED: 3
+ VERIFICATION_SUCCEEDED: 3,
+ // NOTE fate#318433 extra state to track multi-login situation
+ VERIFIED_BUT_FORBIDDEN: 4
};
var BeginRequestType = {
@@ -244,7 +246,12 @@ var AuthPrompt = class {
}
_onVerificationComplete() {
+ // NOTE update the spinning icon
this.setActorInDefaultButtonWell(null);
+
+ if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) {
+ return;
+ }
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false;
}
diff -urp gnome-shell-3.33.91.orig/js/gdm/loginDialog.js gnome-shell-3.33.91/js/gdm/loginDialog.js
--- gnome-shell-3.33.91.orig/js/gdm/loginDialog.js 2019-09-04 12:52:15.396169384 -0500
+++ gnome-shell-3.33.91/js/gdm/loginDialog.js 2019-09-04 14:47:26.796805978 -0500
@@ -917,6 +917,8 @@ var LoginDialog = GObject.registerClass(
this._authPrompt.updateSensitivity(false);
let answer = this._authPrompt.getAnswer();
this._user = this._userManager.get_user(answer);
+ this._userLoginForbidden =
+ this._user.is_x_logged_in_remotely();
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: answer });
@@ -984,6 +986,8 @@ var LoginDialog = GObject.registerClass(
let answer = this._authPrompt.getAnswer();
let domain_answer = this._domainMenuButton.getDomainUser(answer);
this._user = this._userManager.get_user(domain_answer);
@ -20,10 +46,10 @@ Index: gnome-shell-3.25.4/js/gdm/loginDialog.js
this._authPrompt.clear();
this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: domain_answer});
@@ -1023,6 +1027,28 @@ var LoginDialog = new Lang.Class({
},
@@ -1010,6 +1014,28 @@ var LoginDialog = GObject.registerClass(
}
_onSessionOpened: function(client, serviceName) {
_onSessionOpened(client, serviceName) {
+ if ( this._userLoginForbidden ) {
+ this._authPrompt.setMessage(
+ _('Sorry, you have to log out a previous session first. Multiple logins are not supported.'),
@ -46,42 +72,14 @@ Index: gnome-shell-3.25.4/js/gdm/loginDialog.js
+ return;
+ }
+
this._authPrompt.finish(Lang.bind(this, function() {
this._startSession(serviceName);
}));
@@ -1206,6 +1232,7 @@ var LoginDialog = new Lang.Class({
this._authPrompt.finish(() => this._startSession(serviceName));
}
_onUserListActivated: function(activatedItem) {
@@ -1190,6 +1216,7 @@ var LoginDialog = GObject.registerClass(
_onUserListActivated(activatedItem) {
this._user = activatedItem.user;
+ this._userLoginForbidden = this._user.is_x_logged_in_remotely();
this._updateCancelButton();
Index: gnome-shell-3.25.4/js/gdm/authPrompt.js
===================================================================
--- gnome-shell-3.25.4.orig/js/gdm/authPrompt.js
+++ gnome-shell-3.25.4/js/gdm/authPrompt.js
@@ -30,7 +30,9 @@ var AuthPromptStatus = {
NOT_VERIFYING: 0,
VERIFYING: 1,
VERIFICATION_FAILED: 2,
- VERIFICATION_SUCCEEDED: 3
+ VERIFICATION_SUCCEEDED: 3,
+ // NOTE fate#318433 extra state to track multi-login situation
+ VERIFIED_BUT_FORBIDDEN: 4
};
var BeginRequestType = {
@@ -261,7 +263,12 @@ var AuthPrompt = new Lang.Class({
},
_onVerificationComplete: function() {
+ // NOTE update the spinning icon
this.setActorInDefaultButtonWell(null);
+
+ if (this.verificationStatus === AuthPromptStatus.VERIFIED_BUT_FORBIDDEN) {
+ return;
+ }
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
this.cancelButton.reactive = false;
},