[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
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 #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
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362224
In alternative to this, debian branch [1] can be released, and this branch
merged with debian again.
[1] https://salsa.debian.org/gnome-team/gnome-shell/merge_requests/14/
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index beb0740..904b4ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-shell (3.30.2-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032)
+ * d/p/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch:
+- Fix missing icon in keyboard indicator (LP: #1812266)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 00:09:21 +
+
gnome-shell (3.30.2-1ubuntu1) disco; urgency=medium
* Merge with debian, remaining changes:
diff --git a/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch b/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
new file mode 100644
index 000..604404e
--- /dev/null
+++ b/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
@@ -0,0 +1,32 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?=
+Date: Thu, 15 Nov 2018 18:47:55 +0100
+Subject: ibusManager: Don't pass undefined callback to ibus
+
+Since commit 551e8278416, we don't always pass a callback parameter.
+However passing it on as undefined to ibus doesn't work, as gjs doesn't
+accept that as a valid callback value and throw an error. As a result,
+we can end up with no layout selected in the keyboard menu and an "empty"
+indicator. Fix this by explicitly passing null if no callback has been
+provided.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812266/
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/74bb9e62492bacda3
+---
+ js/misc/ibusManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index 34f198c..33ad877 100644
+--- a/js/misc/ibusManager.js
b/js/misc/ibusManager.js
+@@ -210,7 +210,7 @@ var IBusManager = new Lang.Class({
+ }
+
+ this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+- null, callback);
++ null, callback || null);
+ },
+
+ preloadEngines(ids) {
diff --git a/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
new file mode 100644
index 000..1b40015
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
@@ -0,0 +1,213 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Fri, 2 Nov 2018 21:51:33 +0100
+Subject: power: Label the PENDING_CHARGE state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #701.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/701
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/52c59ac0dd7ddbe064
+Applied-Upstream: 3.31.4
+---
+ js/ui/status/power.js | 4 +++-
+ po/ca.po | 4
+ po/de.po | 4
+ po/el.po | 4
+ po/eo.po | 4
+ po/es.po | 4
+ po/fur.po | 4
+ po/it.po | 4
+ po/ja.po | 4
+ po/sl.po | 4
+ po/sv.po | 4
+ po/tr.po | 4
+ 12 files changed, 47 insertions(+), 1 deletion(-)
+
+diff --git a/js/ui/status/power.js b/js/ui/status/power.js
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic
Review: Approve Looks good to me, do you want me to merge/upload that as well or do you plan to land in a silo? -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/362049 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
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 #1779051 in gnome-control-center (Ubuntu):
"/usr/bin/gnome-control-center:11:gtk_container_remove:update_output_settings:on_amplify_changed:g_closure_invoke:signal_emit_unlocked_R"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1779051
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362226
Synced also vcs with ubuntu
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 3c0e09e..3a24f3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
+
+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 01:17:15 +
+
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.2) bionic; urgency=medium
+
+ * debian/patches/70_allow_sound_above_100.patch:
+- Fix crash when settings changed after panel closed (LP: #1779051)
+
+ -- Robert Ancell Wed, 08 Aug 2018 11:48:27 +1200
+
gnome-control-center (1:3.28.2-0ubuntu0.18.04.1) bionic; urgency=medium
* New bugfix version (lp: #1780280)
diff --git a/debian/patches/70_allow_sound_above_100.patch b/debian/patches/70_allow_sound_above_100.patch
index 041cdc2..39a0cef 100644
--- a/debian/patches/70_allow_sound_above_100.patch
+++ b/debian/patches/70_allow_sound_above_100.patch
@@ -215,3 +215,11 @@ Index: gnome-control-center-3.27.90/panels/sound/gvc-mixer-dialog.c
dialog->settings = g_settings_new (KEY_SOUNDS_SCHEMA);
g_signal_connect (dialog->settings, "changed::allow-volume-above-100-percent",
G_CALLBACK (allow_volume_above_100_percent_cb), dialog);
+@@ -1939,6 +2064,7 @@ gvc_mixer_dialog_finalize (GObject *object)
+ mixer_dialog = GVC_MIXER_DIALOG (object);
+
+ g_return_if_fail (mixer_dialog != NULL);
++g_clear_object (&mixer_dialog->ubuntu_sound_settings);
+ g_clear_object (&mixer_dialog->settings);
+ G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object);
+ }
diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
new file mode 100644
index 000..5df4f40
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
@@ -0,0 +1,256 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Sat, 20 Oct 2018 00:34:56 +0200
+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #249.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
+Applied-Upstream: yes, 3.31.2
+---
+ panels/power/cc-power-panel.c | 10 --
+ po/de.po | 7 ++-
+ po/el.po | 8 +++-
+ po/eo.po | 7 ++-
+ po/es.po | 7 ++-
+ po/fur.po | 7 ++-
+ po/it.po | 7 ++-
+ po/ja.po | 7 ++-
+ po/sl.po | 7 ++-
+ po/sv.po | 7 ++-
+ po/tr.po | 8 +++-
+ 11 files changed, 70 insertions(+), 12 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index f9b67a4..d8c87c7 100644
+--- a/panels/power/cc-power-panel.c
b/panels/power/cc-power-panel.c
+@@ -295,7 +295,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 min
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic
I've already a silo almost ready here https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3597/+packages -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/362049 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic has been updated. Description changed to: Synced also vcs with ubuntu, so please pull tags For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362226 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center: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
The proposal to merge ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic has been updated. Status: Needs review => Approved 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 subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
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
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362225
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index d452e13..60439e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.30.2-3ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 00:53:03 +
+
gnome-control-center (1:3.30.2-3ubuntu1) disco; urgency=medium
* Merge with debian unstable. Remaining changes:
diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
new file mode 100644
index 000..c7a2bab
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
@@ -0,0 +1,254 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Sat, 20 Oct 2018 00:34:56 +0200
+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #249.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
+Applied-Upstream: yes, 3.31.2
+---
+ panels/power/cc-power-panel.c | 10 --
+ po/de.po | 7 ++-
+ po/el.po | 8 +++-
+ po/eo.po | 7 ++-
+ po/es.po | 7 ++-
+ po/fur.po | 7 ++-
+ po/it.po | 5 +
+ po/ja.po | 7 ++-
+ po/sl.po | 7 ++-
+ po/sv.po | 7 ++-
+ po/tr.po | 8 +++-
+ 11 files changed, 69 insertions(+), 11 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index 298c2bf..882d469 100644
+--- a/panels/power/cc-power-panel.c
b/panels/power/cc-power-panel.c
+@@ -302,7 +302,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" */
+ details = g_strdup_printf (_("%s until fully charged"), time_string);
+ break;
+@@ -323,6 +322,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Fully charged"));
+ break;
++ case UP_DEVICE_STATE_PENDING_CHARGE:
++/* TRANSLATORS: primary battery */
++details = g_strdup (_("Not charging"));
++break;
+ case UP_DEVICE_STATE_EMPTY:
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Empty"));
+@@ -337,7 +340,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Charging"));
+ break;
+@@ -350,6 +352,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Fully charged"));
+ break;
++ case UP_DEVICE_STATE_PENDING_CHARGE:
++/* TRANSLATORS: primary battery */
++details = g_strdup (_("Not charging"));
++break;
+ case UP_DEVICE_STATE_EMPTY:
+ /* TRANSLATORS: primary battery */
+ details = g_
