[Merge] ~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into ~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into
~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362054
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into
~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x.
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 481cd3a..a0a4a21 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -242,11 +242,11 @@ var AuthPrompt = new Lang.Class({
this.emit('prompted');
},
-_onVerificationFailed() {
+_onVerificationFailed(userVerifier, canRetry) {
this._queryingService = null;
this.clear();
-this.updateSensitivity(true);
+this.updateSensitivity(canRetry);
this.setActorInDefaultButtonWell(null);
this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
},
@@ -439,6 +439,7 @@ var AuthPrompt = new Lang.Class({
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
this.cancelButton.reactive = true;
this.nextButton.label = _("Next");
+this._preemptiveAnswer = null;
if (this._userVerifier)
this._userVerifier.cancel();
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 261e1e4..105a320 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -534,12 +534,13 @@ var ShellUserVerifier = new Lang.Class({
_verificationFailed(retry) {
// For Not Listed / enterprise logins, immediately reset
// the dialog
-// Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
-// go back to the welcome screen.
+// Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.
+// After that, we go back to the welcome screen.
this._failCounter++;
let canRetry = retry && this._userName &&
-this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
+(this._reauthOnly ||
+ this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY));
if (canRetry) {
if (!this.hasPendingMessages) {
@@ -562,7 +563,7 @@ var ShellUserVerifier = new Lang.Class({
}
}
-this.emit('verification-failed');
+this.emit('verification-failed', canRetry);
},
_onConversationStopped(client, serviceName) {
diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 1ce4f83..1442e3d 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -236,11 +236,12 @@ var ObjectManager = new Lang.Class({
_onNameVanished() {
let objectPaths = Object.keys(this._objects);
for (let i = 0; i < objectPaths.length; i++) {
-let object = this._objects[objectPaths];
+let objectPath = objectPaths[i];
+let object = this._objects[objectPath];
let interfaceNames = Object.keys(object);
-for (let j = 0; i < interfaceNames.length; i++) {
-let interfaceName = interfaceNames[i];
+for (let j = 0; j < interfaceNames.length; j++) {
+let interfaceName = interfaceNames[j];
if (object[interfaceName])
this._removeInterface(objectPath, interfaceName);
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 651aac6..fd133cc 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -802,6 +802,8 @@ var NotificationMessage = new Lang.Class({
},
_onDestroy() {
+this.parent();
+
if (this._updatedId)
this.notification.disconnect(this._updatedId);
this._updatedId = 0;
diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 2d8f3f8..a6cd857 100644
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -210,6 +210,10 @@ var AutomountManager = new Lang.Class({
},
_onVolumeRemoved(monitor, volume) {
+if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
+Mainloop.source_remove(volume._allowAutorunExpireId);
+delete volume._allowAutorunExpireId;
+}
this._volumeQueue =
this._volumeQueue.filter(element => (element != volume));
},
@@ -234,8 +238,10 @@ var AutomountManager = new Lang.Class({
_allowAutorunExpire(volume) {
let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
volume.allowAutorun = false;
+delete volume._allowAutorunExpireId;
return GLib.SOURCE_REMOVE;
});
+volume._allowAutorunExpireId = id;
GLib.Source.set_name_by_id(id, '[gnome-shell] volume.allowAutorun');
}
});
diff --git a/js/ui/d
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
> Also, the fix for bug 1767648 (and hence bug 1779615) is not in disco or > cosmic yet(?) For both I'm preparing a landing in disco, don't worry (that's why I'm delaying the fixes on this a bit), so they were planned to land in disco already in the coming upload. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361811 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic with ~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus ZenBook UX410UAK" https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032 Bug #1772677 in gnome-shell (Ubuntu): "gnome-shell filling up syslog with thousands/millions of entries with stack traces ending in osdWindow.js (lines 206/207 in bionic, lines 223/224 in cosmic)" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772677 Bug #1811900 in mutter (Ubuntu): "SRU 3.28 latest git to bionic" https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1811900 Bug #1811908 in gnome-shell (Ubuntu): "gnome-shell: JS ERROR: ReferenceError: GLib is not defined" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1811908 Bug #1812266 in gnome-settings-daemon (Ubuntu): "Keyboard layout indicator does not indicate current layout (18.04 Bionic beaver)" https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1812266 Bug #1812735 in gnome-shell (Ubuntu): "Andyrock has to update this placeholder bug :)" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812735 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362055 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 58f19e1..4e3a2d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +gnome-shell (3.28.3+git20190116-0ubuntu18.04.1) UNRELEASED; urgency=medium + + * New git snapshot release up to commit 24cdcc56d (LP: #1811900) +- Don't fill journal with osdWindow errors (LP: #1772677) + * d/p/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch, +d/p/authPrompt-Unset-preemptiveAnswer-on-reset.patch, +d/p/gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch, +d/p/ibus-set-content-type-no-holdKeyboard.patch, +d/p/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch, +d/p/st-button-Ignore-pointer-emulated-touch-events.patch, +d/p/shell-ignore-invalid-window-monitor-index.patch, +d/p/workspace-fix-repositioned-windows-in-activities.patch: +- Removed patches applied upstream + * d/p/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch, +d/p/js-fix-invalid-access-errors.patch, +d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch, +d/p/optional-hot-corner.patch, +d/p/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch, +d/p/workaround_crasher_fractional_scaling.patch: +- Refreshed as per upstream changes + * d/p/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch: +- Fix missing icon in keyboard indicator (LP: #1812266) + * d/p/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch, +d/p/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch: +- Fix OSK activation on X11 (LP: #1812735) + * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch: +- Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032) + * d/p/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch: +- Add missing include (LP: #1811908) + + -- Marco Trevisan (Treviño) Tue, 22 Jan 2019 01:53:57 +0100 + gnome-shell (3.28.3-0ubuntu0.18.04.4) bionic; urgency=medium * debian/patches/ibus-set-content-type-no-holdKeyboard.patch: diff --git a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch index 96b2cf0..3264a5c 100644 --- a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch +++ b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch @@ -1,5 +1,5 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 18 Oct 2017 05:32:22 -0500 +Date: Wed, 18 Oct 2017 12:32:22 +0200 Subject: StIcon: only compute shadow pipeline when the texture is properly allocated diff --git a/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch b/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch deleted file mode 100644 index ff98dda..000 --- a/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 29 May 2018 02:00:04 +0200 -Subject: authPrompt: Do not enable sensitivity if retries are disallowed - -Set the sensitivity of the UI according to the canRetry parameter and thus -if no more logins are allowed
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Also, the fix for bug 1767648 (and hence bug 1779615) is not in disco or cosmic yet(?) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361811 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Also, the fix is not in disco or cosmic(?) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361811 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1812735 in gnome-shell (Ubuntu): "Andyrock has to update this
placeholder bug :)"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812735
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/362049
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index bb73cc0..f30bf0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.28.1-0ubuntu1.2) UNRELEASED; urgency=medium
+
+ * debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch:
+- Enable IBus for OSK (LP: #1812735)
+
+ -- Marco Trevisan (Treviño) Mon, 21 Jan 2019 20:26:58 +0100
+
gnome-settings-daemon (3.28.1-0ubuntu1.1) bionic; urgency=medium
* debian/patches/git_binary_encoding.patch:
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..52f9b83
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,17 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/bionic
+upstream-branch = upstream/3.28.x
+upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
diff --git a/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch
new file mode 100644
index 000..88f8437
--- /dev/null
+++ b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch
@@ -0,0 +1,199 @@
+From: Carlos Garnacho
+Date: Tue, 25 Sep 2018 20:19:39 +0200
+Subject: keyboard: Enable ibus for OSK purposes
+
+As gnome-shell relies on IBus for focus tracking, enable this IM whenever
+the conditions for OSK popping up might arise.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/95
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1812735
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/95
+Origin: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/b7e1d69593
+---
+ plugins/keyboard/gsd-keyboard-manager.c | 82 +++--
+ 1 file changed, 69 insertions(+), 13 deletions(-)
+
+diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
+index 343b049..480e735 100644
+--- a/plugins/keyboard/gsd-keyboard-manager.c
b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -80,11 +80,15 @@
+
+ #define DEFAULT_LAYOUT "us"
+
++#define GNOME_A11Y_APPLICATIONS_INTERFACE_DIR "org.gnome.desktop.a11y.applications"
++#define KEY_OSK_ENABLED "screen-keyboard-enabled"
++
+ struct GsdKeyboardManagerPrivate
+ {
+ guint start_idle_id;
+ GSettings *settings;
+ GSettings *input_sources_settings;
++GSettings *a11y_settings;
+ GDBusProxy *localed;
+ GCancellable *cancellable;
+
+@@ -92,12 +96,15 @@ struct GsdKeyboardManagerPrivate
+ GsdNumLockState old_state;
+ GdkDeviceManager *device_manager;
+ guint device_added_id;
++guint device_removed_id;
+ };
+
+ static void gsd_keyboard_manager_class_init (GsdKeyboardManagerClass *klass);
+ static void gsd_keyboard_manager_init(GsdKeyboardManager *keyboard_manager);
+ static void gsd_keyboard_manager_finalize(GObject *object);
+
++static void update_gtk_im_module (GsdKeyboardManager *manager);
++
+ G_DEFINE_TYPE (GsdKeyboardManager, gsd_keyboard_manager, G_TYPE_OBJECT)
+
+ static gpointer manager_object = NULL;
+@@ -417,9 +424,23 @@ device_added_cb (GdkDeviceManager *device_manager,
+ if (source == GDK_SOURCE_KEYBOARD) {
+ g_debug ("New keyboard plugged in, applying all settings");
+ apply_numlock (manager);
++} else if (source == GDK_SOURCE_TOUCHSCREEN) {
++update_gtk_im_module (manager);
+ }
+ }
+
++static void
++device_removed_cb (GdkDeviceManager *device_manager,
++ GdkDevice *device,
++ GsdKeyboardManager *manager)
++{
++GdkInputSource source;
++
++source = gdk_device_get_source (device);
++if (source == GDK_SOURCE_TOUCHSCREEN)
++update_gtk_im_module (manager);
++}
++
+ static void
+ set_devicepresence_handler (GsdKeyboardManager *manager)
+ {
+@@ -432,6 +453,8 @@ set_devicepresence_handler (GsdKeyboardManager *manager)
+
+ manager->priv->device_added_id = g_signal_conne
