Merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master

Proposed by Marco Trevisan (Treviño) on 2019-01-25
Status: Rejected
Rejected by: Iain Lane on 2019-01-25
Proposed branch: ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Diff against target: 285 lines (+256/-0)
4 files modified
debian/changelog (+9/-0)
debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch (+32/-0)
debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch (+213/-0)
debian/patches/series (+2/-0)
Reviewer Review Type Date Requested Status
Ubuntu Desktop 2019-01-25 Pending
Review via email: mp+362224@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
Iain Lane (laney) wrote :

That branch is uploaded to unstable, let's merge instead, thanks!

Unmerged commits

d447cd4... by Marco Trevisan (Treviño) on 2019-01-25

debian/patches: Fix missing icon in keyboard indicator

Fixes LP: #1812266

7161eb6... by Marco Trevisan (Treviño) on 2019-01-22

debian/patches: Label the PENDING_CHARGE state as "Not Charging"

Fixes LP: #1745032

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index beb0740..904b4ad 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,12 @@
6+gnome-shell (3.30.2-1ubuntu2) UNRELEASED; urgency=medium
7+
8+ * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch:
9+ - Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032)
10+ * d/p/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch:
11+ - Fix missing icon in keyboard indicator (LP: #1812266)
12+
13+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 25 Jan 2019 00:09:21 +0000
14+
15 gnome-shell (3.30.2-1ubuntu1) disco; urgency=medium
16
17 * Merge with debian, remaining changes:
18diff --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
19new file mode 100644
20index 0000000..604404e
21--- /dev/null
22+++ b/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
23@@ -0,0 +1,32 @@
24+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
25+Date: Thu, 15 Nov 2018 18:47:55 +0100
26+Subject: ibusManager: Don't pass undefined callback to ibus
27+
28+Since commit 551e8278416, we don't always pass a callback parameter.
29+However passing it on as undefined to ibus doesn't work, as gjs doesn't
30+accept that as a valid callback value and throw an error. As a result,
31+we can end up with no layout selected in the keyboard menu and an "empty"
32+indicator. Fix this by explicitly passing null if no callback has been
33+provided.
34+
35+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
36+
37+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812266/
38+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/74bb9e62492bacda3
39+---
40+ js/misc/ibusManager.js | 2 +-
41+ 1 file changed, 1 insertion(+), 1 deletion(-)
42+
43+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
44+index 34f198c..33ad877 100644
45+--- a/js/misc/ibusManager.js
46++++ b/js/misc/ibusManager.js
47+@@ -210,7 +210,7 @@ var IBusManager = new Lang.Class({
48+ }
49+
50+ this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
51+- null, callback);
52++ null, callback || null);
53+ },
54+
55+ preloadEngines(ids) {
56diff --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
57new file mode 100644
58index 0000000..1b40015
59--- /dev/null
60+++ b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
61@@ -0,0 +1,213 @@
62+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= <jprvita@endlessm.com>
63+Date: Fri, 2 Nov 2018 21:51:33 +0100
64+Subject: power: Label the PENDING_CHARGE state as "Not Charging"
65+
66+The pending-charge state means AC power is on but the battery is not
67+being charged. This can happen because its charge is above a certain
68+threshold, to avoid short charging cycles and prolong the battery's
69+life, or because the PSU is not powerful enough to charge the batteries.
70+
71+Instead of lying to the user about something being estimated, we should
72+simply tell the truth and set the label to "Not Charging".
73+
74+Closes: #701.
75+
76+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
77+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/701
78+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/52c59ac0dd7ddbe064
79+Applied-Upstream: 3.31.4
80+---
81+ js/ui/status/power.js | 4 +++-
82+ po/ca.po | 4 ++++
83+ po/de.po | 4 ++++
84+ po/el.po | 4 ++++
85+ po/eo.po | 4 ++++
86+ po/es.po | 4 ++++
87+ po/fur.po | 4 ++++
88+ po/it.po | 4 ++++
89+ po/ja.po | 4 ++++
90+ po/sl.po | 4 ++++
91+ po/sv.po | 4 ++++
92+ po/tr.po | 4 ++++
93+ 12 files changed, 47 insertions(+), 1 deletion(-)
94+
95+diff --git a/js/ui/status/power.js b/js/ui/status/power.js
96+index f21693f..4a6ce2c 100644
97+--- a/js/ui/status/power.js
98++++ b/js/ui/status/power.js
99+@@ -70,7 +70,9 @@ var Indicator = new Lang.Class({
100+ seconds = this._proxy.TimeToFull;
101+ else if (this._proxy.State == UPower.DeviceState.DISCHARGING)
102+ seconds = this._proxy.TimeToEmpty;
103+- // state is one of PENDING_CHARGING, PENDING_DISCHARGING
104++ else if (this._proxy.State == UPower.DeviceState.PENDING_CHARGE)
105++ return _("Not Charging");
106++ // state is PENDING_DISCHARGE
107+ else
108+ return _("Estimating…");
109+
110+diff --git a/po/ca.po b/po/ca.po
111+index 3880b82..27497e3 100644
112+--- a/po/ca.po
113++++ b/po/ca.po
114+@@ -1926,6 +1926,10 @@ msgstr "Paràmetres d'energia"
115+ msgid "Fully Charged"
116+ msgstr "Totalment carregada"
117+
118++#: js/ui/status/power.js:74
119++msgid "Not Charging"
120++msgstr ""
121++
122+ #. 0 is reported when UPower does not have enough data
123+ #. to estimate battery life
124+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
125+diff --git a/po/de.po b/po/de.po
126+index 9244dc6..40bb175 100644
127+--- a/po/de.po
128++++ b/po/de.po
129+@@ -1939,6 +1939,10 @@ msgstr "Energieeinstellungen"
130+ msgid "Fully Charged"
131+ msgstr "Vollständig geladen"
132+
133++#: js/ui/status/power.js:74
134++msgid "Not Charging"
135++msgstr "Lädt nicht"
136++
137+ #. 0 is reported when UPower does not have enough data
138+ #. to estimate battery life
139+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
140+diff --git a/po/el.po b/po/el.po
141+index c822608..2061c24 100644
142+--- a/po/el.po
143++++ b/po/el.po
144+@@ -1795,6 +1795,10 @@ msgstr "Ρυθμίσεις τροφοδοσίας"
145+ msgid "Fully Charged"
146+ msgstr "Πλήρως φορτισμένη"
147+
148++#: js/ui/status/power.js:74
149++msgid "Not Charging"
150++msgstr "Δεν φορτίζεται"
151++
152+ #. 0 is reported when UPower does not have enough data
153+ #. to estimate battery life
154+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
155+diff --git a/po/eo.po b/po/eo.po
156+index f3f1690..a591b2a 100644
157+--- a/po/eo.po
158++++ b/po/eo.po
159+@@ -1871,6 +1871,10 @@ msgstr "Elektro-agordoj"
160+ msgid "Fully Charged"
161+ msgstr "Plene ŝargita"
162+
163++#: js/ui/status/power.js:74
164++msgid "Not Charging"
165++msgstr "Ne ŝargante"
166++
167+ #. 0 is reported when UPower does not have enough data
168+ #. to estimate battery life
169+ #: js/ui/status/power.js:75 js/ui/status/power.js:81
170+diff --git a/po/es.po b/po/es.po
171+index 6c4171f..154249c 100644
172+--- a/po/es.po
173++++ b/po/es.po
174+@@ -1914,6 +1914,10 @@ msgstr "Configuración de energía"
175+ msgid "Fully Charged"
176+ msgstr "Cargada completamente"
177+
178++#: js/ui/status/power.js:74
179++msgid "Not Charging"
180++msgstr "No está cargando"
181++
182+ #. 0 is reported when UPower does not have enough data
183+ #. to estimate battery life
184+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
185+diff --git a/po/fur.po b/po/fur.po
186+index 7380766..8765645 100644
187+--- a/po/fur.po
188++++ b/po/fur.po
189+@@ -1914,6 +1914,10 @@ msgstr "Impostazions di alimentazion"
190+ msgid "Fully Charged"
191+ msgstr "Cjarie"
192+
193++#: js/ui/status/power.js:74
194++msgid "Not Charging"
195++msgstr "Nol sta cjariant"
196++
197+ #. 0 is reported when UPower does not have enough data
198+ #. to estimate battery life
199+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
200+diff --git a/po/it.po b/po/it.po
201+index 98a8e3b..89a834b 100644
202+--- a/po/it.po
203++++ b/po/it.po
204+@@ -1935,6 +1935,10 @@ msgstr "Impostazioni alimentazione"
205+ msgid "Fully Charged"
206+ msgstr "Carica"
207+
208++#: js/ui/status/power.js:74
209++msgid "Not Charging"
210++msgstr "Non in carica"
211++
212+ #. 0 is reported when UPower does not have enough data
213+ #. to estimate battery life
214+ #: js/ui/status/power.js:75 js/ui/status/power.js:81
215+diff --git a/po/ja.po b/po/ja.po
216+index 0264e97..e6ef9a6 100644
217+--- a/po/ja.po
218++++ b/po/ja.po
219+@@ -1800,6 +1800,10 @@ msgstr "電源設定"
220+ msgid "Fully Charged"
221+ msgstr "充電完了"
222+
223++#: js/ui/status/power.js:74
224++msgid "Not Charging"
225++msgstr "放電中"
226++
227+ #. 0 is reported when UPower does not have enough data
228+ #. to estimate battery life
229+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
230+diff --git a/po/sl.po b/po/sl.po
231+index 2d37f35..56ddc1c 100644
232+--- a/po/sl.po
233++++ b/po/sl.po
234+@@ -1936,6 +1936,10 @@ msgstr "Upravljanje napajanja"
235+ msgid "Fully Charged"
236+ msgstr "Polno napolnjeno"
237+
238++#: js/ui/status/power.js:74
239++msgid "Not Charging"
240++msgstr "Naprava se ne polni"
241++
242+ #. 0 is reported when UPower does not have enough data
243+ #. to estimate battery life
244+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
245+diff --git a/po/sv.po b/po/sv.po
246+index 20ceb66..542aced 100644
247+--- a/po/sv.po
248++++ b/po/sv.po
249+@@ -1903,6 +1903,10 @@ msgstr "Ströminställningar"
250+ msgid "Fully Charged"
251+ msgstr "Fulladdad"
252+
253++#: js/ui/status/power.js:74
254++msgid "Not Charging"
255++msgstr "Laddar inte"
256++
257+ #. 0 is reported when UPower does not have enough data
258+ #. to estimate battery life
259+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
260+diff --git a/po/tr.po b/po/tr.po
261+index 9714623..9932d8c 100644
262+--- a/po/tr.po
263++++ b/po/tr.po
264+@@ -1892,6 +1892,10 @@ msgstr "Güç Ayarları"
265+ msgid "Fully Charged"
266+ msgstr "Tümüyle Dolu"
267+
268++#: js/ui/status/power.js:74
269++msgid "Not Charging"
270++msgstr "Şarj Olmuyor"
271++
272+ #. 0 is reported when UPower does not have enough data
273+ #. to estimate battery life
274+ #: js/ui/status/power.js:84 js/ui/status/power.js:90
275diff --git a/debian/patches/series b/debian/patches/series
276index cdd1411..97a0cb2 100644
277--- a/debian/patches/series
278+++ b/debian/patches/series
279@@ -1,4 +1,6 @@
280 keyboard-Do-not-call-KeyboardManager.holdKeyboard-with-se.patch
281+power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
282+ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
283 tweener-Save-handlers-on-target-and-remove-them-on-destro.patch
284 workaround_crasher_fractional_scaling.patch
285 ubuntu/desktop_detect.patch

Subscribers

People subscribed via source and target branches