From 44cd1ae25befd2e2c191b039ed173d4dc7cd597a Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Mon, 15 Apr 2019 11:39:50 +0200 Subject: [PATCH] extensionPrefs: Add ability to warn about extensions being disabled If we disable extensions after a gnome-shell failure, then we should warn the user about this happening. The old concept was to do so in the fail-whale, but we can't even show the fail-whale when running on wayland. Adding this option allows starting up the preference dialog on the next log in and telling the user what happened then. This means we can both tell the user what is going on and enable them to solve the issue at the same time. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/695 --- js/extensionPrefs/main.js | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/js/extensionPrefs/main.js b/js/extensionPrefs/main.js index 4125605b9..54900cefc 100644 --- a/js/extensionPrefs/main.js +++ b/js/extensionPrefs/main.js @@ -219,10 +219,33 @@ var Application = GObject.registerClass({ Gio.SettingsBindFlags.DEFAULT | Gio.SettingsBindFlags.INVERT_BOOLEAN); + let vbox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); + this._window.add(vbox); + + this.disabledInfobar = new Gtk.InfoBar({ + message_type: Gtk.MessageType.ERROR, + revealed: false, + show_close_button: true + }); + this.disabledInfobar.connect('response', () => { + this.disabledInfobar.revealed = false; + }); + let contentArea = this.disabledInfobar.get_content_area(); + let label = new Gtk.Label({ + label: _('A problem was detected and extensions were automatically disabled. It is recommended to disable or reconfigure any extensions that may have caused the issue before re-enabling them at the top.'), + ellipsize: Pango.EllipsizeMode.END, + wrap: true, + lines: 2, + xalign: 0, + margin: 6 + }); + contentArea.add(label); + vbox.add(this.disabledInfobar); + this._mainStack = new Gtk.Stack({ transition_type: Gtk.StackTransitionType.CROSSFADE }); - this._window.add(this._mainStack); + vbox.add(this._mainStack); let scroll = new Gtk.ScrolledWindow({ hscrollbar_policy: Gtk.PolicyType.NEVER }); @@ -338,6 +361,14 @@ var Application = GObject.registerClass({ let args = commandLine.get_arguments(); if (args.length) { + if (args[0] == '--disabled-warning') { + if (!this._settings.is_writable('disable-user-extensions')) + this.quit(); + + this.disabledInfobar.set_revealed(true); + return 0; + } + let uuid = args[0]; this._skipMainWindow = true;