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

Accepting request 526067 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/526067
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=135
This commit is contained in:
Dominique Leuenberger 2017-09-15 19:06:28 +00:00 committed by Git OBS Bridge
commit 12294bf519
8 changed files with 102 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SLEClassicExt.js
View File

@ -20,15 +20,8 @@ const Lang = imports.lang;
const Shell = imports.gi.Shell; const Shell = imports.gi.Shell;
const Signals = imports.signals; const Signals = imports.signals;
const St = imports.gi.St; const St = imports.gi.St;
const Atk = imports.gi.Atk;
const BoxPointer = imports.ui.boxpointer;
const GrabHelper = imports.ui.grabHelper;
const Main = imports.ui.main; const Main = imports.ui.main;
const Params = imports.misc.params;
const Separator = imports.ui.separator;
const Slider = imports.ui.slider;
const Tweener = imports.ui.tweener;
const GNOME_CLASSIC_SESSION_NAME = "classic"; const GNOME_CLASSIC_SESSION_NAME = "classic";

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

@ -1,19 +1,19 @@
Index: gnome-shell-3.24.3/data/gnome-shell-theme.gresource.xml Index: gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-3.24.3.orig/data/gnome-shell-theme.gresource.xml --- gnome-shell-3.26.0.orig/data/gnome-shell-theme.gresource.xml
+++ gnome-shell-3.24.3/data/gnome-shell-theme.gresource.xml +++ gnome-shell-3.26.0/data/gnome-shell-theme.gresource.xml
@@ -39,5 +39,6 @@ @@ -38,5 +38,6 @@
<file>toggle-on-hc.svg</file> <file>toggle-on-hc.svg</file>
<file>ws-switch-arrow-up.png</file> <file>ws-switch-arrow-up.png</file>
<file>ws-switch-arrow-down.png</file> <file>ws-switch-arrow-down.png</file>
+ <file>sle-background.png</file> + <file>sle-background.png</file>
</gresource> </gresource>
</gresources> </gresources>
Index: gnome-shell-3.24.3/data/theme/gnome-shell.css Index: gnome-shell-3.26.0/data/theme/gnome-shell.css
=================================================================== ===================================================================
--- gnome-shell-3.24.3.orig/data/theme/gnome-shell.css --- gnome-shell-3.26.0.orig/data/theme/gnome-shell.css
+++ gnome-shell-3.24.3/data/theme/gnome-shell.css +++ gnome-shell-3.26.0/data/theme/gnome-shell.css
@@ -1603,6 +1603,9 @@ StScrollBar { @@ -1599,6 +1599,9 @@ StScrollBar {
padding-top: 24px; padding-top: 24px;
max-width: 23em; } max-width: 23em; }
@ -23,11 +23,11 @@ Index: gnome-shell-3.24.3/data/theme/gnome-shell.css
.login-dialog { .login-dialog {
border: none; border: none;
background-color: transparent; } background-color: transparent; }
Index: gnome-shell-3.24.3/js/ui/unlockDialog.js Index: gnome-shell-3.26.0/js/ui/unlockDialog.js
=================================================================== ===================================================================
--- gnome-shell-3.24.3.orig/js/ui/unlockDialog.js --- gnome-shell-3.26.0.orig/js/ui/unlockDialog.js
+++ gnome-shell-3.24.3/js/ui/unlockDialog.js +++ gnome-shell-3.26.0/js/ui/unlockDialog.js
@@ -37,6 +37,7 @@ const UnlockDialog = new Lang.Class({ @@ -37,6 +37,7 @@ var UnlockDialog = new Lang.Class({
layout_manager: new Clutter.BoxLayout(), layout_manager: new Clutter.BoxLayout(),
visible: false }); visible: false });

9
gnome-shell-disable-ibus-when-not-installed.patch
View File

@ -1,7 +1,8 @@
diff -Nura gnome-shell-3.20.3/js/misc/ibusManager.js gnome-shell-3.20.3_new/js/misc/ibusManager.js Index: gnome-shell-3.26.0/js/misc/ibusManager.js
--- gnome-shell-3.20.3/js/misc/ibusManager.js 2015-11-05 13:55:13.000000000 +0000 ===================================================================
+++ gnome-shell-3.20.3_new/js/misc/ibusManager.js 2016-08-10 08:58:04.686046644 +0000 --- gnome-shell-3.26.0.orig/js/misc/ibusManager.js
@@ -44,6 +44,10 @@ +++ gnome-shell-3.26.0/js/misc/ibusManager.js
@@ -45,6 +45,10 @@ var IBusManager = new Lang.Class({
_PRELOAD_ENGINES_DELAY_TIME: 30, // sec _PRELOAD_ENGINES_DELAY_TIME: 30, // sec
_init: function() { _init: function() {

34
gnome-shell-domain.patch
View File

@ -1,7 +1,7 @@
Index: gnome-shell-3.24.2/js/gdm/domain.js Index: gnome-shell-3.26.0/js/gdm/domain.js
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gnome-shell-3.24.2/js/gdm/domain.js +++ gnome-shell-3.26.0/js/gdm/domain.js
@@ -0,0 +1,243 @@ @@ -0,0 +1,243 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+/* +/*
@ -246,10 +246,10 @@ Index: gnome-shell-3.24.2/js/gdm/domain.js
+ } + }
+}); +});
+Signals.addSignalMethods(DomainMenuButton.prototype); +Signals.addSignalMethods(DomainMenuButton.prototype);
Index: gnome-shell-3.24.2/js/gdm/loginDialog.js Index: gnome-shell-3.26.0/js/gdm/loginDialog.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/gdm/loginDialog.js --- gnome-shell-3.26.0.orig/js/gdm/loginDialog.js
+++ gnome-shell-3.24.2/js/gdm/loginDialog.js +++ gnome-shell-3.26.0/js/gdm/loginDialog.js
@@ -33,6 +33,7 @@ const Signals = imports.signals; @@ -33,6 +33,7 @@ const Signals = imports.signals;
const St = imports.gi.St; const St = imports.gi.St;
@ -258,7 +258,7 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
const Batch = imports.gdm.batch; const Batch = imports.gdm.batch;
const BoxPointer = imports.ui.boxpointer; const BoxPointer = imports.ui.boxpointer;
const CtrlAltTab = imports.ui.ctrlAltTab; const CtrlAltTab = imports.ui.ctrlAltTab;
@@ -429,6 +430,14 @@ const LoginDialog = new Lang.Class({ @@ -452,6 +453,14 @@ var LoginDialog = new Lang.Class({
this._authPrompt.hide(); this._authPrompt.hide();
this.actor.add_child(this._authPrompt.actor); this.actor.add_child(this._authPrompt.actor);
@ -273,7 +273,7 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
// translators: this message is shown below the user list on the // translators: this message is shown below the user list on the
// login screen. It can be activated to reveal an entry for // login screen. It can be activated to reveal an entry for
// manually entering the username. // manually entering the username.
@@ -446,10 +455,24 @@ const LoginDialog = new Lang.Class({ @@ -469,10 +478,24 @@ var LoginDialog = new Lang.Class({
this._notListedButton.hide(); this._notListedButton.hide();
@ -300,7 +300,7 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view', this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view',
opacity: 0, opacity: 0,
@@ -918,6 +941,37 @@ const LoginDialog = new Lang.Class({ @@ -948,6 +971,37 @@ var LoginDialog = new Lang.Class({
})); }));
}, },
@ -338,7 +338,7 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
_startSession: function(serviceName) { _startSession: function(serviceName) {
Tweener.addTween(this.actor, Tweener.addTween(this.actor,
{ opacity: 0, { opacity: 0,
@@ -1086,6 +1140,11 @@ const LoginDialog = new Lang.Class({ @@ -1116,6 +1170,11 @@ var LoginDialog = new Lang.Class({
this._askForUsernameAndBeginVerification(); this._askForUsernameAndBeginVerification();
}, },
@ -350,7 +350,7 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
_hideUserListAndBeginVerification: function() { _hideUserListAndBeginVerification: function() {
this._hideUserList(); this._hideUserList();
this._authPrompt.begin(); this._authPrompt.begin();
@@ -1098,6 +1157,9 @@ const LoginDialog = new Lang.Class({ @@ -1128,6 +1187,9 @@ var LoginDialog = new Lang.Class({
this._sessionMenuButton.close(); this._sessionMenuButton.close();
this._setUserListExpanded(true); this._setUserListExpanded(true);
this._notListedButton.show(); this._notListedButton.show();
@ -360,10 +360,10 @@ Index: gnome-shell-3.24.2/js/gdm/loginDialog.js
this._userList.actor.grab_key_focus(); this._userList.actor.grab_key_focus();
}, },
Index: gnome-shell-3.24.2/po/POTFILES.in Index: gnome-shell-3.26.0/po/POTFILES.in
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/po/POTFILES.in --- gnome-shell-3.26.0.orig/po/POTFILES.in
+++ gnome-shell-3.24.2/po/POTFILES.in +++ gnome-shell-3.26.0/po/POTFILES.in
@@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in @@ -7,6 +7,7 @@ data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.PortalHelper.desktop.in.in data/org.gnome.Shell.PortalHelper.desktop.in.in
js/extensionPrefs/main.js js/extensionPrefs/main.js
@ -371,11 +371,11 @@ Index: gnome-shell-3.24.2/po/POTFILES.in
+js/gdm/domain.js +js/gdm/domain.js
js/gdm/loginDialog.js js/gdm/loginDialog.js
js/gdm/util.js js/gdm/util.js
js/misc/util.js js/misc/systemActions.js
Index: gnome-shell-3.24.2/js/js-resources.gresource.xml Index: gnome-shell-3.26.0/js/js-resources.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml --- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.24.2/js/js-resources.gresource.xml +++ gnome-shell-3.26.0/js/js-resources.gresource.xml
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
<gresources> <gresources>
<gresource prefix="/org/gnome/shell"> <gresource prefix="/org/gnome/shell">

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

@ -1,8 +1,8 @@
Index: gnome-shell-3.24.2/js/js-resources.gresource.xml Index: gnome-shell-3.26.0/js/js-resources.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml --- gnome-shell-3.26.0.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.24.2/js/js-resources.gresource.xml +++ gnome-shell-3.26.0/js/js-resources.gresource.xml
@@ -33,6 +33,7 @@ @@ -34,6 +34,7 @@
<file>portalHelper/main.js</file> <file>portalHelper/main.js</file>
@ -10,10 +10,10 @@ Index: gnome-shell-3.24.2/js/js-resources.gresource.xml
<file>ui/accessDialog.js</file> <file>ui/accessDialog.js</file>
<file>ui/altTab.js</file> <file>ui/altTab.js</file>
<file>ui/animation.js</file> <file>ui/animation.js</file>
Index: gnome-shell-3.24.2/js/ui/aboutMenu.js Index: gnome-shell-3.26.0/js/ui/aboutMenu.js
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gnome-shell-3.24.2/js/ui/aboutMenu.js +++ gnome-shell-3.26.0/js/ui/aboutMenu.js
@@ -0,0 +1,150 @@ @@ -0,0 +1,150 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+ +
@ -165,11 +165,11 @@ Index: gnome-shell-3.24.2/js/ui/aboutMenu.js
+ +
+ return hostname; + return hostname;
+} +}
Index: gnome-shell-3.24.2/js/ui/panel.js Index: gnome-shell-3.26.0/js/ui/panel.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/panel.js --- gnome-shell-3.26.0.orig/js/ui/panel.js
+++ gnome-shell-3.24.2/js/ui/panel.js +++ gnome-shell-3.26.0/js/ui/panel.js
@@ -758,6 +758,7 @@ const AggregateMenu = new Lang.Class({ @@ -758,6 +758,7 @@ var AggregateMenu = new Lang.Class({
}); });
const PANEL_ITEM_IMPLEMENTATIONS = { const PANEL_ITEM_IMPLEMENTATIONS = {
@ -177,11 +177,11 @@ Index: gnome-shell-3.24.2/js/ui/panel.js
'activities': ActivitiesButton, 'activities': ActivitiesButton,
'aggregateMenu': AggregateMenu, 'aggregateMenu': AggregateMenu,
'appMenu': AppMenuButton, 'appMenu': AppMenuButton,
Index: gnome-shell-3.24.2/js/ui/sessionMode.js Index: gnome-shell-3.26.0/js/ui/sessionMode.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/sessionMode.js --- gnome-shell-3.26.0.orig/js/ui/sessionMode.js
+++ gnome-shell-3.24.2/js/ui/sessionMode.js +++ gnome-shell-3.26.0/js/ui/sessionMode.js
@@ -48,7 +48,7 @@ const _modes = { @@ -47,7 +47,7 @@ const _modes = {
unlockDialog: imports.gdm.loginDialog.LoginDialog, unlockDialog: imports.gdm.loginDialog.LoginDialog,
components: ['polkitAgent'], components: ['polkitAgent'],
panel: { panel: {

12
gnome-shell.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Sep 13 02:39:59 UTC 2017 - xwang@suse.com
- Update sle-classic patches to version 3.26.0:
+ Update SLEClassicExt.js
+ Update gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
+ Update gnome-shell-disable-ibus-when-not-installed.patch
+ Update gnome-shell-domain.patch
+ Update gnome-shell-gdm-login-applet.patch
+ Update gs-fate318433-prevent-same-account-multi-logins.patch
+ Update gs-sle-classic-ext.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 12 19:13:25 UTC 2017 - luc14n0@linuxmail.org Tue Sep 12 19:13:25 UTC 2017 - luc14n0@linuxmail.org

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

@ -1,8 +1,8 @@
Index: gnome-shell-3.24.3/js/gdm/loginDialog.js Index: gnome-shell-3.25.4/js/gdm/loginDialog.js
=================================================================== ===================================================================
--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js --- gnome-shell-3.25.4.orig/js/gdm/loginDialog.js
+++ gnome-shell-3.24.3/js/gdm/loginDialog.js +++ gnome-shell-3.25.4/js/gdm/loginDialog.js
@@ -897,6 +897,8 @@ const LoginDialog = new Lang.Class({ @@ -926,6 +926,8 @@ var LoginDialog = new Lang.Class({
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);
@ -11,7 +11,7 @@ Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
this._authPrompt.clear(); this._authPrompt.clear();
this._authPrompt.startSpinning(); this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: answer }); this._authPrompt.begin({ userName: answer });
@@ -960,6 +962,8 @@ const LoginDialog = new Lang.Class({ @@ -990,6 +992,8 @@ var LoginDialog = new Lang.Class({
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);
@ -20,7 +20,7 @@ Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
this._authPrompt.clear(); this._authPrompt.clear();
this._authPrompt.startSpinning(); this._authPrompt.startSpinning();
this._authPrompt.begin({ userName: domain_answer}); this._authPrompt.begin({ userName: domain_answer});
@@ -993,6 +997,28 @@ const LoginDialog = new Lang.Class({ @@ -1023,6 +1027,28 @@ var LoginDialog = new Lang.Class({
}, },
_onSessionOpened: function(client, serviceName) { _onSessionOpened: function(client, serviceName) {
@ -49,7 +49,7 @@ Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
this._authPrompt.finish(Lang.bind(this, function() { this._authPrompt.finish(Lang.bind(this, function() {
this._startSession(serviceName); this._startSession(serviceName);
})); }));
@@ -1176,6 +1202,7 @@ const LoginDialog = new Lang.Class({ @@ -1206,6 +1232,7 @@ var LoginDialog = new Lang.Class({
_onUserListActivated: function(activatedItem) { _onUserListActivated: function(activatedItem) {
this._user = activatedItem.user; this._user = activatedItem.user;
@ -57,11 +57,11 @@ Index: gnome-shell-3.24.3/js/gdm/loginDialog.js
this._updateCancelButton(); this._updateCancelButton();
Index: gnome-shell-3.24.3/js/gdm/authPrompt.js Index: gnome-shell-3.25.4/js/gdm/authPrompt.js
=================================================================== ===================================================================
--- gnome-shell-3.24.3.orig/js/gdm/authPrompt.js --- gnome-shell-3.25.4.orig/js/gdm/authPrompt.js
+++ gnome-shell-3.24.3/js/gdm/authPrompt.js +++ gnome-shell-3.25.4/js/gdm/authPrompt.js
@@ -30,7 +30,9 @@ const AuthPromptStatus = { @@ -30,7 +30,9 @@ var AuthPromptStatus = {
NOT_VERIFYING: 0, NOT_VERIFYING: 0,
VERIFYING: 1, VERIFYING: 1,
VERIFICATION_FAILED: 2, VERIFICATION_FAILED: 2,
@ -71,8 +71,8 @@ Index: gnome-shell-3.24.3/js/gdm/authPrompt.js
+ VERIFIED_BUT_FORBIDDEN: 4 + VERIFIED_BUT_FORBIDDEN: 4
}; };
const BeginRequestType = { var BeginRequestType = {
@@ -261,9 +263,14 @@ const AuthPrompt = new Lang.Class({ @@ -261,7 +263,12 @@ var AuthPrompt = new Lang.Class({
}, },
_onVerificationComplete: function() { _onVerificationComplete: function() {
@ -83,8 +83,5 @@ Index: gnome-shell-3.24.3/js/gdm/authPrompt.js
+ return; + return;
+ } + }
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED; this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
- this.cancelButton.reactive = false; this.cancelButton.reactive = false;
+ this.cancelButton.reactive = false;
}, },
_onReset: function() {

56
gs-sle-classic-ext.patch
View File

@ -1,8 +1,8 @@
Index: gnome-shell-3.24.2/js/js-resources.gresource.xml Index: gnome-shell-3.25.91/js/js-resources.gresource.xml
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml --- gnome-shell-3.25.91.orig/js/js-resources.gresource.xml
+++ gnome-shell-3.24.2/js/js-resources.gresource.xml +++ gnome-shell-3.25.91/js/js-resources.gresource.xml
@@ -108,6 +108,7 @@ @@ -111,6 +111,7 @@
<file>ui/workspaceThumbnail.js</file> <file>ui/workspaceThumbnail.js</file>
<file>ui/workspacesView.js</file> <file>ui/workspacesView.js</file>
<file>ui/xdndHandler.js</file> <file>ui/xdndHandler.js</file>
@ -10,20 +10,20 @@ Index: gnome-shell-3.24.2/js/js-resources.gresource.xml
<file>ui/components/__init__.js</file> <file>ui/components/__init__.js</file>
<file>ui/components/autorunManager.js</file> <file>ui/components/autorunManager.js</file>
Index: gnome-shell-3.24.2/js/ui/layout.js Index: gnome-shell-3.25.91/js/ui/layout.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/layout.js --- gnome-shell-3.25.91.orig/js/ui/layout.js
+++ gnome-shell-3.24.2/js/ui/layout.js +++ gnome-shell-3.25.91/js/ui/layout.js
@@ -25,6 +25,8 @@ const BACKGROUND_FADE_ANIMATION_TIME = 1 @@ -25,6 +25,8 @@ var BACKGROUND_FADE_ANIMATION_TIME = 1.0
const HOT_CORNER_PRESSURE_THRESHOLD = 100; // pixels var HOT_CORNER_PRESSURE_THRESHOLD = 100; // pixels
const HOT_CORNER_PRESSURE_TIMEOUT = 1000; // ms var HOT_CORNER_PRESSURE_TIMEOUT = 1000; // ms
+const SLEClassicExt = imports.ui.SLEClassicExt; +const SLEClassicExt = imports.ui.SLEClassicExt;
+ +
function isPopupMetaWindow(actor) { function isPopupMetaWindow(actor) {
switch(actor.meta_window.get_window_type()) { switch(actor.meta_window.get_window_type()) {
case Meta.WindowType.DROPDOWN_MENU: case Meta.WindowType.DROPDOWN_MENU:
@@ -458,7 +460,7 @@ const LayoutManager = new Lang.Class({ @@ -458,7 +460,7 @@ var LayoutManager = new Lang.Class({
this.screenShieldGroup.set_position(0, 0); this.screenShieldGroup.set_position(0, 0);
this.screenShieldGroup.set_size(global.screen_width, global.screen_height); this.screenShieldGroup.set_size(global.screen_width, global.screen_height);
@ -32,11 +32,11 @@ Index: gnome-shell-3.24.2/js/ui/layout.js
this.panelBox.set_size(this.primaryMonitor.width, -1); this.panelBox.set_size(this.primaryMonitor.width, -1);
this.keyboardIndex = this.primaryIndex; this.keyboardIndex = this.primaryIndex;
Index: gnome-shell-3.24.2/js/ui/main.js Index: gnome-shell-3.25.91/js/ui/main.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/main.js --- gnome-shell-3.25.91.orig/js/ui/main.js
+++ gnome-shell-3.24.2/js/ui/main.js +++ gnome-shell-3.25.91/js/ui/main.js
@@ -46,6 +46,8 @@ const Magnifier = imports.ui.magnifier; @@ -45,6 +45,8 @@ const Magnifier = imports.ui.magnifier;
const XdndHandler = imports.ui.xdndHandler; const XdndHandler = imports.ui.xdndHandler;
const Util = imports.misc.util; const Util = imports.misc.util;
@ -45,7 +45,7 @@ Index: gnome-shell-3.24.2/js/ui/main.js
const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard'; const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
const STICKY_KEYS_ENABLE = 'stickykeys-enable'; const STICKY_KEYS_ENABLE = 'stickykeys-enable';
const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a'; const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a';
@@ -132,6 +134,8 @@ function start() { @@ -130,6 +132,8 @@ function start() {
shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler(); shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
_sessionUpdated(); _sessionUpdated();
@ -54,20 +54,20 @@ Index: gnome-shell-3.24.2/js/ui/main.js
} }
function _initializeUI() { function _initializeUI() {
Index: gnome-shell-3.24.2/js/ui/panel.js Index: gnome-shell-3.25.91/js/ui/panel.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/panel.js --- gnome-shell-3.25.91.orig/js/ui/panel.js
+++ gnome-shell-3.24.2/js/ui/panel.js +++ gnome-shell-3.25.91/js/ui/panel.js
@@ -25,6 +25,8 @@ const RemoteMenu = imports.ui.remoteMenu @@ -25,6 +25,8 @@ const RemoteMenu = imports.ui.remoteMenu
const Main = imports.ui.main; const Main = imports.ui.main;
const Tweener = imports.ui.tweener; const Tweener = imports.ui.tweener;
+const SLEClassicExt = imports.ui.SLEClassicExt; +const SLEClassicExt = imports.ui.SLEClassicExt
+ +
const PANEL_ICON_SIZE = 16; var PANEL_ICON_SIZE = 16;
const APP_MENU_ICON_MARGIN = 0; var APP_MENU_ICON_MARGIN = 0;
@@ -826,7 +828,9 @@ const Panel = new Lang.Class({ @@ -850,7 +852,9 @@ var Panel = new Lang.Class({
alloc.natural_size = -1; alloc.natural_size = -1;
}, },
@ -78,11 +78,11 @@ Index: gnome-shell-3.24.2/js/ui/panel.js
let allocWidth = box.x2 - box.x1; let allocWidth = box.x2 - box.x1;
let allocHeight = box.y2 - box.y1; let allocHeight = box.y2 - box.y1;
Index: gnome-shell-3.24.2/js/ui/sessionMode.js Index: gnome-shell-3.25.91/js/ui/sessionMode.js
=================================================================== ===================================================================
--- gnome-shell-3.24.2.orig/js/ui/sessionMode.js --- gnome-shell-3.25.91.orig/js/ui/sessionMode.js
+++ gnome-shell-3.24.2/js/ui/sessionMode.js +++ gnome-shell-3.25.91/js/ui/sessionMode.js
@@ -14,6 +14,8 @@ const Config = imports.misc.config; @@ -13,6 +13,8 @@ const Config = imports.misc.config;
const DEFAULT_MODE = 'restrictive'; const DEFAULT_MODE = 'restrictive';
@ -91,7 +91,7 @@ Index: gnome-shell-3.24.2/js/ui/sessionMode.js
const _modes = { const _modes = {
'restrictive': { 'restrictive': {
parentMode: null, parentMode: null,
@@ -119,6 +121,7 @@ function _loadMode(file, info) { @@ -118,6 +120,7 @@ function _loadMode(file, info) {
try { try {
[success, fileContent, tag] = file.load_contents(null); [success, fileContent, tag] = file.load_contents(null);
newMode = JSON.parse(fileContent); newMode = JSON.parse(fileContent);