diff --git a/aboutMenu.js b/aboutMenu.js index 0f08316..41e4542 100644 --- a/aboutMenu.js +++ b/aboutMenu.js @@ -9,6 +9,17 @@ const DBus = imports.gi.DBus; const PanelMenu = imports.ui.panelMenu; +const HostnameIface = ' \ + \ + \ + \ + \ + \ + \ + \ +'; +const HostnameProxy = Gio.DBusProxy.makeProxyWrapper(HostnameIface); + const AboutMenuButton = new Lang.Class({ Name: 'AboutMenuButton', Extends: PanelMenu.Button, @@ -109,42 +120,16 @@ const AboutMenuButton = new Lang.Class({ }); function get_hostname() { - let hostname; - let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'), - GLib.Variant.new_string('Hostname')]; - - let call = { - bus_name: 'org.freedesktop.hostname1', - object_path: '/org/freedesktop/hostname1', - interface_name: 'org.freedesktop.DBus.Properties', - method_name: 'Get', - parameters: GLib.Variant.new_tuple(interface_name, 2), - reply_type: null, - flags: Gio.DBusCallFlags.NONE, - timeout_msec: -1, - cancellable: null, - }; + let hostnameProxy = HostnameProxy(Gio.DBus.system, + 'org.freedesktop.hostname1', + '/org/freedesktop/hostname1', + null, null); try { - let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null); - - let message = dbusConnection.call_sync( - call.bus_name, - call.object_path, - call.interface_name, - call.method_name, - call.parameters, - call.reply_type, - call.flags, - call.timeout_msec, - call.cancellable - ); - - hostname = message.get_child_value(0).get_variant().get_string()[0]; + let name = hostnameProxy.GetSync('org.freedesktop.hostname1', 'Hostname'); + return name[0].get_string()[0]; } catch(e) { - hostname = 'localhost'; + return 'localhost'; } - - return hostname; } diff --git a/endSession-dialog-update-time-label-every-sec.patch b/endSession-dialog-update-time-label-every-sec.patch index a50a15e..c1a95c2 100644 --- a/endSession-dialog-update-time-label-every-sec.patch +++ b/endSession-dialog-update-time-label-every-sec.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-3.20.1/js/ui/endSessionDialog.js +Index: gnome-shell-3.24.2/js/ui/endSessionDialog.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/endSessionDialog.js -+++ gnome-shell-3.20.1/js/ui/endSessionDialog.js -@@ -403,8 +403,10 @@ const EndSessionDialog = new Lang.Class( +--- gnome-shell-3.24.2.orig/js/ui/endSessionDialog.js ++++ gnome-shell-3.24.2/js/ui/endSessionDialog.js +@@ -426,8 +426,10 @@ const EndSessionDialog = new Lang.Class( let description; let displayTime = _roundSecondsToInterval(this._totalSecondsToStayOpen, diff --git a/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch b/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch index 1b5c71c..baf665d 100644 --- a/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch +++ b/gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch @@ -1,19 +1,19 @@ -Index: gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml +Index: gnome-shell-3.24.3/data/gnome-shell-theme.gresource.xml =================================================================== ---- gnome-shell-3.20.4.orig/data/gnome-shell-theme.gresource.xml -+++ gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml -@@ -38,5 +38,6 @@ +--- gnome-shell-3.24.3.orig/data/gnome-shell-theme.gresource.xml ++++ gnome-shell-3.24.3/data/gnome-shell-theme.gresource.xml +@@ -39,5 +39,6 @@ toggle-on-hc.svg ws-switch-arrow-up.png ws-switch-arrow-down.png + sle-background.png -Index: gnome-shell-3.20.4/data/theme/gnome-shell.css +Index: gnome-shell-3.24.3/data/theme/gnome-shell.css =================================================================== ---- gnome-shell-3.20.4.orig/data/theme/gnome-shell.css -+++ gnome-shell-3.20.4/data/theme/gnome-shell.css -@@ -1544,6 +1544,9 @@ StScrollBar { +--- gnome-shell-3.24.3.orig/data/theme/gnome-shell.css ++++ gnome-shell-3.24.3/data/theme/gnome-shell.css +@@ -1603,6 +1603,9 @@ StScrollBar { padding-top: 24px; max-width: 23em; } @@ -23,10 +23,10 @@ Index: gnome-shell-3.20.4/data/theme/gnome-shell.css .login-dialog { border: none; background-color: transparent; } -Index: gnome-shell-3.20.4/js/ui/unlockDialog.js +Index: gnome-shell-3.24.3/js/ui/unlockDialog.js =================================================================== ---- gnome-shell-3.20.4.orig/js/ui/unlockDialog.js -+++ gnome-shell-3.20.4/js/ui/unlockDialog.js +--- gnome-shell-3.24.3.orig/js/ui/unlockDialog.js ++++ gnome-shell-3.24.3/js/ui/unlockDialog.js @@ -37,6 +37,7 @@ const UnlockDialog = new Lang.Class({ layout_manager: new Clutter.BoxLayout(), visible: false }); diff --git a/gnome-shell-864872-unlock-by-mouse-motion.patch b/gnome-shell-864872-unlock-by-mouse-motion.patch index f854940..b49fae3 100644 --- a/gnome-shell-864872-unlock-by-mouse-motion.patch +++ b/gnome-shell-864872-unlock-by-mouse-motion.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-3.20.1/js/ui/screenShield.js +Index: gnome-shell-3.24.2/js/ui/screenShield.js =================================================================== ---- gnome-shell-3.20.1.orig/js/ui/screenShield.js -+++ gnome-shell-3.20.1/js/ui/screenShield.js -@@ -418,6 +418,8 @@ const ScreenShield = new Lang.Class({ +--- 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({ this.actor = Main.layoutManager.screenShieldGroup; this._lockScreenState = MessageTray.State.HIDDEN; @@ -11,7 +11,7 @@ Index: gnome-shell-3.20.1/js/ui/screenShield.js this._lockScreenGroup = new St.Widget({ x_expand: true, y_expand: true, reactive: true, -@@ -427,6 +429,8 @@ const ScreenShield = new Lang.Class({ +@@ -447,6 +449,8 @@ const ScreenShield = new Lang.Class({ }); this._lockScreenGroup.connect('key-press-event', Lang.bind(this, this._onLockScreenKeyPress)); @@ -20,7 +20,7 @@ Index: gnome-shell-3.20.1/js/ui/screenShield.js this._lockScreenGroup.connect('scroll-event', Lang.bind(this, this._onLockScreenScroll)); Main.ctrlAltTabManager.addGroup(this._lockScreenGroup, _("Lock"), 'changes-prevent-symbolic'); -@@ -657,6 +661,25 @@ const ScreenShield = new Lang.Class({ +@@ -686,6 +690,25 @@ const ScreenShield = new Lang.Class({ return Clutter.EVENT_STOP; }, @@ -46,7 +46,7 @@ Index: gnome-shell-3.20.1/js/ui/screenShield.js _onLockScreenScroll: function(actor, event) { if (this._lockScreenState != MessageTray.State.SHOWN) return Clutter.EVENT_PROPAGATE; -@@ -973,6 +996,8 @@ const ScreenShield = new Lang.Class({ +@@ -1005,6 +1028,8 @@ const ScreenShield = new Lang.Class({ return; this._ensureLockScreen(); diff --git a/gnome-shell-878951-hide-list-with-no-user.patch b/gnome-shell-878951-hide-list-with-no-user.patch index 2ea8cab..fb9a722 100644 --- a/gnome-shell-878951-hide-list-with-no-user.patch +++ b/gnome-shell-878951-hide-list-with-no-user.patch @@ -1,7 +1,7 @@ -diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index 2f70c1f..642f9a2 100644 ---- a/js/gdm/loginDialog.js -+++ b/js/gdm/loginDialog.js +Index: gnome-shell-3.24.3/js/gdm/loginDialog.js +=================================================================== +--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.24.3/js/gdm/loginDialog.js @@ -730,6 +730,14 @@ const LoginDialog = new Lang.Class({ _updateDisableUserList: function() { let disableUserList = this._settings.get_boolean(GdmUtil.DISABLE_USER_LIST_KEY); @@ -17,7 +17,7 @@ index 2f70c1f..642f9a2 100644 if (disableUserList != this._disableUserList) { this._disableUserList = disableUserList; -@@ -1232,14 +1240,18 @@ const LoginDialog = new Lang.Class({ +@@ -1264,14 +1272,18 @@ const LoginDialog = new Lang.Class({ this._userList.addUser(users[i]); } diff --git a/gnome-shell-domain.patch b/gnome-shell-domain.patch index 6b5cd42..7df18af 100644 --- a/gnome-shell-domain.patch +++ b/gnome-shell-domain.patch @@ -1,7 +1,7 @@ -Index: gnome-shell-3.20.1/js/gdm/domain.js +Index: gnome-shell-3.24.2/js/gdm/domain.js =================================================================== --- /dev/null -+++ gnome-shell-3.20.1/js/gdm/domain.js ++++ gnome-shell-3.24.2/js/gdm/domain.js @@ -0,0 +1,243 @@ +// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +/* @@ -246,10 +246,10 @@ Index: gnome-shell-3.20.1/js/gdm/domain.js + } +}); +Signals.addSignalMethods(DomainMenuButton.prototype); -Index: gnome-shell-3.20.1/js/gdm/loginDialog.js +Index: gnome-shell-3.24.2/js/gdm/loginDialog.js =================================================================== ---- gnome-shell-3.20.1.orig/js/gdm/loginDialog.js -+++ gnome-shell-3.20.1/js/gdm/loginDialog.js +--- gnome-shell-3.24.2.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.24.2/js/gdm/loginDialog.js @@ -33,6 +33,7 @@ const Signals = imports.signals; const St = imports.gi.St; @@ -300,7 +300,7 @@ Index: gnome-shell-3.20.1/js/gdm/loginDialog.js this._bannerView = new St.ScrollView({ style_class: 'login-dialog-banner-view', opacity: 0, -@@ -919,6 +942,37 @@ const LoginDialog = new Lang.Class({ +@@ -918,6 +941,37 @@ const LoginDialog = new Lang.Class({ })); }, @@ -338,7 +338,7 @@ Index: gnome-shell-3.20.1/js/gdm/loginDialog.js _startSession: function(serviceName) { Tweener.addTween(this.actor, { opacity: 0, -@@ -1087,6 +1141,11 @@ const LoginDialog = new Lang.Class({ +@@ -1086,6 +1140,11 @@ const LoginDialog = new Lang.Class({ this._askForUsernameAndBeginVerification(); }, @@ -350,7 +350,7 @@ Index: gnome-shell-3.20.1/js/gdm/loginDialog.js _hideUserListAndBeginVerification: function() { this._hideUserList(); this._authPrompt.begin(); -@@ -1099,6 +1158,9 @@ const LoginDialog = new Lang.Class({ +@@ -1098,6 +1157,9 @@ const LoginDialog = new Lang.Class({ this._sessionMenuButton.close(); this._setUserListExpanded(true); this._notListedButton.show(); @@ -360,22 +360,22 @@ Index: gnome-shell-3.20.1/js/gdm/loginDialog.js this._userList.actor.grab_key_focus(); }, -Index: gnome-shell-3.20.1/po/POTFILES.in +Index: gnome-shell-3.24.2/po/POTFILES.in =================================================================== ---- gnome-shell-3.20.1.orig/po/POTFILES.in -+++ gnome-shell-3.20.1/po/POTFILES.in -@@ -8,6 +8,7 @@ data/org.gnome.shell.gschema.xml.in.in - data/org.gnome.Shell.PortalHelper.desktop.in +--- gnome-shell-3.24.2.orig/po/POTFILES.in ++++ gnome-shell-3.24.2/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/util.js -Index: gnome-shell-3.20.1/js/js-resources.gresource.xml +Index: gnome-shell-3.24.2/js/js-resources.gresource.xml =================================================================== ---- gnome-shell-3.20.1.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.20.1/js/js-resources.gresource.xml +--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.24.2/js/js-resources.gresource.xml @@ -2,6 +2,7 @@ diff --git a/gnome-shell-gdm-login-applet.patch b/gnome-shell-gdm-login-applet.patch index 2efe8c2..6326077 100644 --- a/gnome-shell-gdm-login-applet.patch +++ b/gnome-shell-gdm-login-applet.patch @@ -1,21 +1,175 @@ -Index: gnome-shell-3.20.4/js/js-resources.gresource.xml +Index: gnome-shell-3.24.2/js/js-resources.gresource.xml =================================================================== ---- gnome-shell-3.20.4.orig/js/js-resources.gresource.xml -+++ gnome-shell-3.20.4/js/js-resources.gresource.xml -@@ -25,7 +25,7 @@ - misc/params.js - misc/smartcardManager.js - misc/util.js -- -+ ui/aboutMenu.js - perf/core.js - perf/hwtest.js +--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.24.2/js/js-resources.gresource.xml +@@ -33,6 +33,7 @@ -Index: gnome-shell-3.20.4/js/ui/panel.js + portalHelper/main.js + ++ ui/aboutMenu.js + ui/accessDialog.js + ui/altTab.js + ui/animation.js +Index: gnome-shell-3.24.2/js/ui/aboutMenu.js =================================================================== ---- gnome-shell-3.20.4.orig/js/ui/panel.js -+++ gnome-shell-3.20.4/js/ui/panel.js -@@ -755,6 +755,7 @@ const AggregateMenu = new Lang.Class({ +--- /dev/null ++++ gnome-shell-3.24.2/js/ui/aboutMenu.js +@@ -0,0 +1,150 @@ ++// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- ++ ++const GLib = imports.gi.GLib; ++const Gio = imports.gi.Gio; ++const Lang = imports.lang; ++const Clutter = imports.gi.Clutter; ++const St = imports.gi.St; ++const DBus = imports.gi.DBus; ++ ++const PanelMenu = imports.ui.panelMenu; ++ ++const AboutMenuButton = new Lang.Class({ ++ Name: 'AboutMenuButton', ++ Extends: PanelMenu.Button, ++ _init: function() { ++ this._hostname = null; ++ this._updateHostnameId = 0; ++ this._ticket = 1; ++ ++ let hbox; ++ let vbox; ++ let menuAlignment = 0.25; ++ ++ if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) ++ menuAlignment = 1.0 - menuAlignment; ++ this.parent(menuAlignment, 'About Me'); ++ ++ this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); ++ this.hostname_label = new St.Label({y_align: Clutter.ActorAlign.CENTER}); ++ this.about_hbox.add_child(this.hostname_label); ++ ++ this.actor.add_child(this.about_hbox); ++ hbox = new St.BoxLayout({ name: 'aboutArea' }); ++ this.menu.box.add_child(hbox); ++ ++ vbox = new St.BoxLayout({vertical: true}); ++ hbox.add(vbox); ++ ++ ///// Section: read '/etc/os-release' to get pretty name ++ // ++ // Note: previously this is defaulted to 'SUSE Linux Enterprise', now ++ // let's use a "safer" option. ++ let sysinfo_text = 'SUSE Linux'; ++ try { ++ let success, contents, tag; ++ let _os_release = Gio.File.new_for_path('/etc/os-release'); ++ [success, contents, tag] = _os_release.load_contents(null); ++ ++ let osReleaseContentStr = contents.toString(); ++ let prettyNameReg = /^PRETTY_NAME="(.+)"/; ++ let match = null; ++ for (let line of osReleaseContentStr.split('\n')) { ++ match = prettyNameReg.exec(line); ++ if (match) { ++ sysinfo_text = match[1]; ++ } ++ } ++ } ++ catch (e) { ++ // NOTE soft fail, 'sysinfo_text' is the default ++ warn('ERROR: fail to read /etc/os-release'); ++ } ++ ++ this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true }); ++ vbox.add(this._sysinfo); ++ this.actor.hide(); ++ ++ this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, ++ this._ticket, ++ Lang.bind(this, function() { ++ if (this._ticket < 60*60) ++ this._ticket *= 2; ++ this._updateHostnameId = 0; ++ this._updateHostname(); ++ return false; ++ })); ++ ++ return; ++ }, ++ ++ _updateHostname: function(){ ++ let hostname_text = get_hostname(); ++ ++ if ((this._hostname == null) || (this._hostname != hostname_text)) { ++ this._ticket = 1; ++ this._hostname = hostname_text; ++ this.hostname_label.set_text(this._hostname); ++ this.actor.show(); ++ } ++ this._updateHostnameId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, ++ this._ticket, ++ Lang.bind(this, function() { ++ if (this._ticket < 60*60) ++ this._ticket *= 2; ++ this._updateHostnameId = 0; ++ this._updateHostname(); ++ return false; ++ })); ++ }, ++ ++ _destroy: function() { ++ this._ticket = 1; ++ if (this._updateHostnameId) { ++ GLib.source_remove (this._updateHostnameId); ++ this._updateHostnameId = 0; ++ } ++ }, ++ ++}); ++ ++function get_hostname() { ++ let hostname; ++ let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'), ++ GLib.Variant.new_string('Hostname')]; ++ ++ let call = { ++ bus_name: 'org.freedesktop.hostname1', ++ object_path: '/org/freedesktop/hostname1', ++ interface_name: 'org.freedesktop.DBus.Properties', ++ method_name: 'Get', ++ parameters: GLib.Variant.new_tuple(interface_name, 2), ++ reply_type: null, ++ flags: Gio.DBusCallFlags.NONE, ++ timeout_msec: -1, ++ cancellable: null, ++ }; ++ ++ try { ++ let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null); ++ ++ let message = dbusConnection.call_sync( ++ call.bus_name, ++ call.object_path, ++ call.interface_name, ++ call.method_name, ++ call.parameters, ++ call.reply_type, ++ call.flags, ++ call.timeout_msec, ++ call.cancellable ++ ); ++ ++ hostname = message.get_child_value(0).get_variant().get_string()[0]; ++ ++ } catch(e) { ++ hostname = 'localhost'; ++ } ++ ++ return hostname; ++} +Index: gnome-shell-3.24.2/js/ui/panel.js +=================================================================== +--- gnome-shell-3.24.2.orig/js/ui/panel.js ++++ gnome-shell-3.24.2/js/ui/panel.js +@@ -758,6 +758,7 @@ const AggregateMenu = new Lang.Class({ }); const PANEL_ITEM_IMPLEMENTATIONS = { @@ -23,10 +177,10 @@ Index: gnome-shell-3.20.4/js/ui/panel.js 'activities': ActivitiesButton, 'aggregateMenu': AggregateMenu, 'appMenu': AppMenuButton, -Index: gnome-shell-3.20.4/js/ui/sessionMode.js +Index: gnome-shell-3.24.2/js/ui/sessionMode.js =================================================================== ---- gnome-shell-3.20.4.orig/js/ui/sessionMode.js -+++ gnome-shell-3.20.4/js/ui/sessionMode.js +--- gnome-shell-3.24.2.orig/js/ui/sessionMode.js ++++ gnome-shell-3.24.2/js/ui/sessionMode.js @@ -48,7 +48,7 @@ const _modes = { unlockDialog: imports.gdm.loginDialog.LoginDialog, components: ['polkitAgent'], diff --git a/gnome-shell-lock-bg-on-primary.patch b/gnome-shell-lock-bg-on-primary.patch index f337d87..f936207 100644 --- a/gnome-shell-lock-bg-on-primary.patch +++ b/gnome-shell-lock-bg-on-primary.patch @@ -1,8 +1,8 @@ -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index 5a48922..ba97fce 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -524,9 +524,31 @@ const ScreenShield = new Lang.Class({ +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({ y_expand: true, reactive: true, pivot_point: new Clutter.Point({ x: 0.5, y: 0.5 }), diff --git a/gnome-shell-login-fix-session-button-can-be-clicked.patch b/gnome-shell-login-fix-session-button-can-be-clicked.patch index 1817ecb..e00632f 100644 --- a/gnome-shell-login-fix-session-button-can-be-clicked.patch +++ b/gnome-shell-login-fix-session-button-can-be-clicked.patch @@ -11,11 +11,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=781482 js/gdm/loginDialog.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js -index 0b6c0b50a..a43544742 100644 ---- a/js/gdm/loginDialog.js -+++ b/js/gdm/loginDialog.js -@@ -775,10 +775,12 @@ const LoginDialog = new Lang.Class({ +Index: gnome-shell-3.24.3/js/gdm/loginDialog.js +=================================================================== +--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.24.3/js/gdm/loginDialog.js +@@ -806,10 +806,12 @@ const LoginDialog = new Lang.Class({ }, _onPrompted: function() { @@ -30,7 +30,7 @@ index 0b6c0b50a..a43544742 100644 this._showPrompt(); }, -@@ -881,6 +883,7 @@ const LoginDialog = new Lang.Class({ +@@ -914,6 +916,7 @@ const LoginDialog = new Lang.Class({ })); this._updateCancelButton(); @@ -38,6 +38,3 @@ index 0b6c0b50a..a43544742 100644 this._authPrompt.updateSensitivity(true); this._showPrompt(); }, --- -2.12.0 - diff --git a/gnome-shell-screen-disappear.patch b/gnome-shell-screen-disappear.patch index 6bf0ae4..cfb63e8 100644 --- a/gnome-shell-screen-disappear.patch +++ b/gnome-shell-screen-disappear.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-3.20.1/js/gdm/authPrompt.js +Index: gnome-shell-3.24.2/js/gdm/authPrompt.js =================================================================== ---- gnome-shell-3.20.1.orig/js/gdm/authPrompt.js -+++ gnome-shell-3.20.1/js/gdm/authPrompt.js -@@ -456,8 +456,10 @@ const AuthPrompt = new Lang.Class({ +--- gnome-shell-3.24.2.orig/js/gdm/authPrompt.js ++++ gnome-shell-3.24.2/js/gdm/authPrompt.js +@@ -458,8 +458,10 @@ const AuthPrompt = new Lang.Class({ this.setUser(null); this.stopSpinning(); diff --git a/gnome-shell.changes b/gnome-shell.changes index fa7074d..bf62dc7 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Aug 2 02:35:25 UTC 2017 - xwang@suse.com + +- Update sle-classic patches to version 3.24.3: + + Update aboutMenu.js + + Update endSession-dialog-update-time-label-every-sec.patch + + Update gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch + + Update gnome-shell-864872-unlock-by-mouse-motion.patch + + Update gnome-shell-878951-hide-list-with-no-user.patch + + Update gnome-shell-domain.patch + + Update gnome-shell-gdm-login-applet.patch + + Update gnome-shell-lock-bg-on-primary.patch + + Update + gnome-shell-login-fix-session-button-can-be-clicked.patch + + Update gnome-shell-screen-disappear.patch + + Update gs-fate318433-prevent-same-account-multi-logins.patch + + Update gs-sle-classic-ext.patch + ------------------------------------------------------------------- Thu Jul 20 08:33:03 UTC 2017 - zaitor@opensuse.org diff --git a/gs-fate318433-prevent-same-account-multi-logins.patch b/gs-fate318433-prevent-same-account-multi-logins.patch index 4a9fe81..e6173a3 100644 --- a/gs-fate318433-prevent-same-account-multi-logins.patch +++ b/gs-fate318433-prevent-same-account-multi-logins.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-3.20.3/js/gdm/loginDialog.js +Index: gnome-shell-3.24.3/js/gdm/loginDialog.js =================================================================== ---- gnome-shell-3.20.3.orig/js/gdm/loginDialog.js -+++ gnome-shell-3.20.3/js/gdm/loginDialog.js -@@ -900,6 +900,8 @@ const LoginDialog = new Lang.Class({ +--- gnome-shell-3.24.3.orig/js/gdm/loginDialog.js ++++ gnome-shell-3.24.3/js/gdm/loginDialog.js +@@ -897,6 +897,8 @@ const LoginDialog = new Lang.Class({ this._authPrompt.updateSensitivity(false); let answer = this._authPrompt.getAnswer(); this._user = this._userManager.get_user(answer); @@ -11,7 +11,7 @@ Index: gnome-shell-3.20.3/js/gdm/loginDialog.js this._authPrompt.clear(); this._authPrompt.startSpinning(); this._authPrompt.begin({ userName: answer }); -@@ -963,6 +965,8 @@ const LoginDialog = new Lang.Class({ +@@ -960,6 +962,8 @@ const LoginDialog = new Lang.Class({ let answer = this._authPrompt.getAnswer(); let domain_answer = this._domainMenuButton.getDomainUser(answer); this._user = this._userManager.get_user(domain_answer); @@ -20,7 +20,7 @@ Index: gnome-shell-3.20.3/js/gdm/loginDialog.js this._authPrompt.clear(); this._authPrompt.startSpinning(); this._authPrompt.begin({ userName: domain_answer}); -@@ -996,6 +1000,28 @@ const LoginDialog = new Lang.Class({ +@@ -993,6 +997,28 @@ const LoginDialog = new Lang.Class({ }, _onSessionOpened: function(client, serviceName) { @@ -49,7 +49,7 @@ Index: gnome-shell-3.20.3/js/gdm/loginDialog.js this._authPrompt.finish(Lang.bind(this, function() { this._startSession(serviceName); })); -@@ -1179,6 +1205,7 @@ const LoginDialog = new Lang.Class({ +@@ -1176,6 +1202,7 @@ const LoginDialog = new Lang.Class({ _onUserListActivated: function(activatedItem) { this._user = activatedItem.user; @@ -57,10 +57,10 @@ Index: gnome-shell-3.20.3/js/gdm/loginDialog.js this._updateCancelButton(); -Index: gnome-shell-3.20.3/js/gdm/authPrompt.js +Index: gnome-shell-3.24.3/js/gdm/authPrompt.js =================================================================== ---- gnome-shell-3.20.3.orig/js/gdm/authPrompt.js -+++ gnome-shell-3.20.3/js/gdm/authPrompt.js +--- gnome-shell-3.24.3.orig/js/gdm/authPrompt.js ++++ gnome-shell-3.24.3/js/gdm/authPrompt.js @@ -30,7 +30,9 @@ const AuthPromptStatus = { NOT_VERIFYING: 0, VERIFYING: 1, diff --git a/gs-sle-classic-ext.patch b/gs-sle-classic-ext.patch index f81169a..4dfa67d 100644 --- a/gs-sle-classic-ext.patch +++ b/gs-sle-classic-ext.patch @@ -1,8 +1,8 @@ -diff --git a/js/js-resources.gresource.xml b/sp2-rebasing/gnome-shell-3.20.1/js/js-resources.gresource.xml -index 33feba2..53566a7 100644 ---- a/js/js-resources.gresource.xml -+++ b/js/js-resources.gresource.xml -@@ -103,6 +103,7 @@ +Index: gnome-shell-3.24.2/js/js-resources.gresource.xml +=================================================================== +--- gnome-shell-3.24.2.orig/js/js-resources.gresource.xml ++++ gnome-shell-3.24.2/js/js-resources.gresource.xml +@@ -108,6 +108,7 @@ ui/workspaceThumbnail.js ui/workspacesView.js ui/xdndHandler.js @@ -10,11 +10,11 @@ index 33feba2..53566a7 100644 ui/components/__init__.js ui/components/autorunManager.js -diff --git a/js/ui/layout.js b/sp2-rebasing/gnome-shell-3.20.1/js/ui/layout.js -index 7ec6867..9c35714 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -25,6 +25,8 @@ const BACKGROUND_FADE_ANIMATION_TIME = 1.0; +Index: gnome-shell-3.24.2/js/ui/layout.js +=================================================================== +--- gnome-shell-3.24.2.orig/js/ui/layout.js ++++ gnome-shell-3.24.2/js/ui/layout.js +@@ -25,6 +25,8 @@ const BACKGROUND_FADE_ANIMATION_TIME = 1 const HOT_CORNER_PRESSURE_THRESHOLD = 100; // pixels const HOT_CORNER_PRESSURE_TIMEOUT = 1000; // ms @@ -23,7 +23,7 @@ index 7ec6867..9c35714 100644 function isPopupMetaWindow(actor) { switch(actor.meta_window.get_window_type()) { case Meta.WindowType.DROPDOWN_MENU: -@@ -457,7 +459,7 @@ const LayoutManager = new Lang.Class({ +@@ -458,7 +460,7 @@ const LayoutManager = new Lang.Class({ this.screenShieldGroup.set_position(0, 0); this.screenShieldGroup.set_size(global.screen_width, global.screen_height); @@ -32,11 +32,11 @@ index 7ec6867..9c35714 100644 this.panelBox.set_size(this.primaryMonitor.width, -1); this.keyboardIndex = this.primaryIndex; -diff --git a/js/ui/main.js b/sp2-rebasing/gnome-shell-3.20.1/js/ui/main.js -index ad95ce0..7b20e67 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -44,6 +44,8 @@ const Magnifier = imports.ui.magnifier; +Index: gnome-shell-3.24.2/js/ui/main.js +=================================================================== +--- gnome-shell-3.24.2.orig/js/ui/main.js ++++ gnome-shell-3.24.2/js/ui/main.js +@@ -46,6 +46,8 @@ const Magnifier = imports.ui.magnifier; const XdndHandler = imports.ui.xdndHandler; const Util = imports.misc.util; @@ -45,7 +45,7 @@ index ad95ce0..7b20e67 100644 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard'; const STICKY_KEYS_ENABLE = 'stickykeys-enable'; const GNOMESHELL_STARTED_MESSAGE_ID = 'f3ea493c22934e26811cd62abe8e203a'; -@@ -127,6 +129,8 @@ function start() { +@@ -132,6 +134,8 @@ function start() { shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler(); _sessionUpdated(); @@ -54,11 +54,11 @@ index ad95ce0..7b20e67 100644 } function _initializeUI() { -diff --git a/js/ui/panel.js b/sp2-rebasing/gnome-shell-3.20.1/js/ui/panel.js -index b55e2a9..f30693c 100644 ---- a/js/ui/panel.js -+++ b/js/ui/panel.js -@@ -25,6 +25,8 @@ const RemoteMenu = imports.ui.remoteMenu; +Index: gnome-shell-3.24.2/js/ui/panel.js +=================================================================== +--- gnome-shell-3.24.2.orig/js/ui/panel.js ++++ gnome-shell-3.24.2/js/ui/panel.js +@@ -25,6 +25,8 @@ const RemoteMenu = imports.ui.remoteMenu const Main = imports.ui.main; const Tweener = imports.ui.tweener; @@ -67,7 +67,7 @@ index b55e2a9..f30693c 100644 const PANEL_ICON_SIZE = 16; const APP_MENU_ICON_MARGIN = 0; -@@ -823,7 +825,9 @@ const Panel = new Lang.Class({ +@@ -826,7 +828,9 @@ const Panel = new Lang.Class({ alloc.natural_size = -1; }, @@ -78,10 +78,10 @@ index b55e2a9..f30693c 100644 let allocWidth = box.x2 - box.x1; let allocHeight = box.y2 - box.y1; -diff --git a/js/ui/sessionMode.js b/sp2-rebasing/gnome-shell-3.20.1/js/ui/sessionMode.js -index d947d5a..628a2ed 100644 ---- a/js/ui/sessionMode.js -+++ b/js/ui/sessionMode.js +Index: gnome-shell-3.24.2/js/ui/sessionMode.js +=================================================================== +--- gnome-shell-3.24.2.orig/js/ui/sessionMode.js ++++ gnome-shell-3.24.2/js/ui/sessionMode.js @@ -14,6 +14,8 @@ const Config = imports.misc.config; const DEFAULT_MODE = 'restrictive';