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

Proposed by Marco Trevisan (Treviño)
Status: Rejected
Rejected by: Iain Lane
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 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.
Revision history for this message
Iain Lane (laney) wrote :

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

Unmerged commits

d447cd4... by Marco Trevisan (Treviño)

debian/patches: Fix missing icon in keyboard indicator

Fixes LP: #1812266

7161eb6... by Marco Trevisan (Treviño)

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

Subscribers

People subscribed via source and target branches