Merge lp:~noskcaj/gnome-control-center/3.14 into lp:~ubuntu-desktop/gnome-control-center/ubuntu
- 3.14
- Merge into ubuntu
Proposed by
Jackson Doak
on 2014-12-20
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 653 | ||||
Proposed branch: | lp:~noskcaj/gnome-control-center/3.14 | ||||
Merge into: | lp:~ubuntu-desktop/gnome-control-center/ubuntu | ||||
Diff against target: |
1186 lines (+451/-305) 12 files modified
debian/changelog (+102/-1) debian/control (+6/-9) debian/control.in (+5/-8) debian/patches/30_stack_overflow.patch (+30/-0) debian/patches/31_printers_border.patch (+25/-0) debian/patches/52_region_language.patch (+52/-60) debian/patches/56_use_ubuntu_info_branding.patch (+15/-9) debian/patches/gcc_not_in_unity.patch (+182/-0) debian/patches/revert_automatic_timezone.patch (+0/-105) debian/patches/revert_git_dont_hide_zoom.patch (+0/-76) debian/patches/series (+2/-2) debian/patches/ubuntu_external_panels.patch (+32/-35) |
||||
To merge this branch: | bzr merge lp:~noskcaj/gnome-control-center/3.14 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Lunn | Approve on 2014-12-20 | ||
Ubuntu Desktop | 2014-12-20 | Pending | |
Review via email:
|
Commit message
Description of the change
Merge version 3.14 from debian.
To post a comment you must log in.
lp:~noskcaj/gnome-control-center/3.14
updated
on 2014-12-20
- 655. By Jackson Doak on 2014-12-20
-
Drop our revert_
git_dont_ hide_zoom. patch, no longer needed.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2014-10-30 11:17:40 +0000 |
3 | +++ debian/changelog 2014-12-20 20:42:39 +0000 |
4 | @@ -1,3 +1,105 @@ |
5 | +gnome-control-center (1:3.14.2-2ubuntu1) vivid; urgency=low |
6 | + |
7 | + * Merge with Debian, remaining changes: LP: #1399047 |
8 | + + debian/patches: |
9 | + - revert_git_new_bluetooth_panel.patch, |
10 | + revert_new_bluetooth.patch, |
11 | + revert-bluetooth-BlueZ5-interface.patch: |
12 | + Revert bluetooth back to Bluez4 |
13 | + - 52_region_language.patch |
14 | + Adapt region panel to use Ubuntu style regions and UTF-8 |
15 | + - 56_use_ubuntu_info_branding.patch, |
16 | + ubuntu-gnome-version.patch |
17 | + Use Ubuntu GNOME branding |
18 | + - 64_restore_terminal_keyboard_shortcut.patch |
19 | + Bring back terminal shortcut |
20 | + - 92_ubuntu_system_proxy.patch |
21 | + Add system proxy support |
22 | + - 99_add_lock-on-suspend.patch |
23 | + Add option to lock on suspend |
24 | + - revert_git_drop_library.patch, |
25 | + ubuntu_external_panels.patch |
26 | + Reimplement support for external panels |
27 | + + debian/control.in: |
28 | + - Relax build-deps on gnome-bluetooth |
29 | + - Drop Recommends for packages not in main |
30 | + - Various other Ubuntu specific changes |
31 | + + debian/libgnome-control-center1.symbols: |
32 | + - Add new symbols from external panel patch |
33 | + + debian/gnome-control-center-data.install: |
34 | + - don't install the pkla yet |
35 | + + Split out shared data that is used by unity-control-center |
36 | + + Add a wrapper to run unity-control-center in Unity |
37 | + + Install apport hook |
38 | + * Drop our revert_git_dont_hide_zoom.patch, no longer needed. |
39 | + |
40 | + -- Jackson Doak <noskcaj@ubuntu.com> Sun, 30 Nov 2014 21:44:23 +0000 |
41 | + |
42 | +gnome-control-center (1:3.14.2-2) unstable; urgency=medium |
43 | + |
44 | + * Remove system-config-printer recommendation. |
45 | + |
46 | + -- Josselin Mouette <joss@debian.org> Sun, 30 Nov 2014 14:38:52 +0100 |
47 | + |
48 | +gnome-control-center (1:3.14.2-1) unstable; urgency=medium |
49 | + |
50 | + * New upstream translation and bugfix release. |
51 | + + Disables SSLv3 because POODLE. |
52 | + * 30_stack_overflow.patch: patch from upstream git. Prevents stack |
53 | + overflow in sharing panel. |
54 | + * 31_printers_border.patch: patch from upstream git. Removes unwanted |
55 | + border around printer model name. |
56 | + |
57 | + -- Josselin Mouette <joss@debian.org> Sun, 30 Nov 2014 11:08:12 +0100 |
58 | + |
59 | +gnome-control-center (1:3.14.1-1) unstable; urgency=medium |
60 | + |
61 | + * New upstream release. |
62 | + * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) |
63 | + |
64 | + -- Laurent Bigonville <bigon@debian.org> Sat, 18 Oct 2014 01:35:32 +0200 |
65 | + |
66 | +gnome-control-center (1:3.14.0-1) unstable; urgency=medium |
67 | + |
68 | + * Bump gnome-settings-daemon dependency |
69 | + - 'org.gnome.settings-daemon.plugins.media-keys' key 'control-center' |
70 | + added during 3.13 and needed by gnome-control-center keyboard panel. |
71 | + * Drop Recommends on ntp since we now rely on systemd-timesyncd for |
72 | + automatic time (and AIUI ntp integration in gnome never really worked |
73 | + anyway because of the default configuration the debian package shipped). |
74 | + * New upstream release. |
75 | + * Upload to unstable. |
76 | + |
77 | + -- Andreas Henriksson <andreas@fatal.se> Mon, 22 Sep 2014 19:49:03 +0200 |
78 | + |
79 | +gnome-control-center (1:3.13.91-1) experimental; urgency=medium |
80 | + |
81 | + [ Jordi Mallach ] |
82 | + * Add cracklib-runtime to Recommends, it's needed for password changing. |
83 | + |
84 | + [ Andreas Henriksson ] |
85 | + * New upstream development release. |
86 | + * Update build-dependencies according to configure.ac changes: |
87 | + - Bump gsettings-desktop-schemas-dev to (>= 3.13.91) |
88 | + - Drop libgnome-menu-3-dev |
89 | + - Bump libgtk-3-dev to (>= 3.13.0) |
90 | + * Update dependencies: |
91 | + - Drop gnome-menus |
92 | + - Bump gsettings-desktop-schemas to (>= 3.13.91) |
93 | + |
94 | + [ Laurent Bigonville ] |
95 | + * Add debian/patches/07_polkit_wheel_sudo_group.patch: The "wheel" group is |
96 | + not existing on debian, check if the user is member of the "sudo" group |
97 | + instead (Closes: #760722) |
98 | + |
99 | + [ Andreas Henriksson ] |
100 | + * Update debian/gnome-control-center.pkla with what is currently listed |
101 | + in upstreams panels/common/gnome-control-center.rules since we don't yet |
102 | + have/depend-on policykit-1 >= 0.106 which means the rules file is still |
103 | + unused. This fixes automatic time/timezone, etc. |
104 | + |
105 | + -- Andreas Henriksson <andreas@fatal.se> Sun, 07 Sep 2014 11:34:18 +0200 |
106 | + |
107 | gnome-control-center (1:3.12.1-5ubuntu3) vivid; urgency=medium |
108 | |
109 | * Drop power-panel-3.10.patch and bump upower build dep to >= 0.99. |
110 | @@ -4178,4 +4280,3 @@ |
111 | |
112 | -- Jim Pick <jim@jimpick.com> Mon, 16 Mar 1998 15:27:43 -0800 |
113 | |
114 | - |
115 | |
116 | === modified file 'debian/control' |
117 | --- debian/control 2014-10-30 11:09:09 +0000 |
118 | +++ debian/control 2014-12-20 20:42:39 +0000 |
119 | @@ -7,8 +7,8 @@ |
120 | Priority: optional |
121 | Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
122 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
123 | -Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org> |
124 | -Standards-Version: 3.9.5 |
125 | +Uploaders: Andreas Henriksson <andreas@fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org> |
126 | +Standards-Version: 3.9.6 |
127 | Build-Depends: autotools-dev, |
128 | cdbs (>= 0.4.41), |
129 | debhelper (>= 9), |
130 | @@ -19,7 +19,7 @@ |
131 | gnome-common, |
132 | gnome-pkg-tools (>= 0.10), |
133 | gnome-settings-daemon-dev (>= 3.7.3), |
134 | - gsettings-desktop-schemas-dev (>= 3.9.91), |
135 | + gsettings-desktop-schemas-dev (>= 3.13.91), |
136 | gtk-doc-tools, |
137 | intltool (>= 0.37.1), |
138 | libcanberra-gtk3-dev, |
139 | @@ -33,13 +33,12 @@ |
140 | libgirepository1.0-dev, |
141 | libglib2.0-dev (>= 2.37.7), |
142 | libgnome-desktop-3-dev (>= 3.11.3), |
143 | - libgnome-menu-3-dev, |
144 | libgnomekbd-dev (>= 2.91.91), |
145 | libgnome-bluetooth-dev (>= 3.3.4) [linux-any], |
146 | libibus-1.0-dev (>= 1.5.2), |
147 | libgoa-1.0-dev (>= 3.9.90), |
148 | libgrilo-0.2-dev (>= 0.2.6), |
149 | - libgtk-3-dev (>= 3.11.1), |
150 | + libgtk-3-dev (>= 3.13.0), |
151 | libgtop2-dev, |
152 | libkrb5-dev, |
153 | libnm-glib-dev (>= 0.9.8) [linux-any], |
154 | @@ -81,9 +80,8 @@ |
155 | gnome-desktop3-data, |
156 | gnome-icon-theme (>= 3.7), |
157 | gnome-icon-theme-symbolic (>= 3.7), |
158 | - gnome-menus (>= 3.7.90), |
159 | - gnome-settings-daemon (>= 3.7.91), |
160 | - gsettings-desktop-schemas (>= 3.9.91), |
161 | + gnome-settings-daemon (>= 3.13.91), |
162 | + gsettings-desktop-schemas (>= 3.13.91), |
163 | Recommends: cups-pk-helper, |
164 | gnome-control-center-shared-data, |
165 | # gnome-session-bin, |
166 | @@ -93,7 +91,6 @@ |
167 | iso-codes, |
168 | libcanberra-pulse, |
169 | mousetweaks, |
170 | - ntp, |
171 | policykit-1-gnome, |
172 | system-config-printer-gnome, |
173 | cracklib-runtime, |
174 | |
175 | === modified file 'debian/control.in' |
176 | --- debian/control.in 2014-10-30 11:09:09 +0000 |
177 | +++ debian/control.in 2014-12-20 20:42:39 +0000 |
178 | @@ -4,7 +4,7 @@ |
179 | Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
180 | XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> |
181 | Uploaders: @GNOME_TEAM@ |
182 | -Standards-Version: 3.9.5 |
183 | +Standards-Version: 3.9.6 |
184 | Build-Depends: autotools-dev, |
185 | cdbs (>= 0.4.41), |
186 | debhelper (>= 9), |
187 | @@ -15,7 +15,7 @@ |
188 | gnome-common, |
189 | gnome-pkg-tools (>= 0.10), |
190 | gnome-settings-daemon-dev (>= 3.7.3), |
191 | - gsettings-desktop-schemas-dev (>= 3.9.91), |
192 | + gsettings-desktop-schemas-dev (>= 3.13.91), |
193 | gtk-doc-tools, |
194 | intltool (>= 0.37.1), |
195 | libcanberra-gtk3-dev, |
196 | @@ -29,13 +29,12 @@ |
197 | libgirepository1.0-dev, |
198 | libglib2.0-dev (>= 2.37.7), |
199 | libgnome-desktop-3-dev (>= 3.11.3), |
200 | - libgnome-menu-3-dev, |
201 | libgnomekbd-dev (>= 2.91.91), |
202 | libgnome-bluetooth-dev (>= 3.3.4) [linux-any], |
203 | libibus-1.0-dev (>= 1.5.2), |
204 | libgoa-1.0-dev (>= 3.9.90), |
205 | libgrilo-0.2-dev (>= 0.2.6), |
206 | - libgtk-3-dev (>= 3.11.1), |
207 | + libgtk-3-dev (>= 3.13.0), |
208 | libgtop2-dev, |
209 | libkrb5-dev, |
210 | libnm-glib-dev (>= 0.9.8) [linux-any], |
211 | @@ -77,9 +76,8 @@ |
212 | gnome-desktop3-data, |
213 | gnome-icon-theme (>= 3.7), |
214 | gnome-icon-theme-symbolic (>= 3.7), |
215 | - gnome-menus (>= 3.7.90), |
216 | - gnome-settings-daemon (>= 3.7.91), |
217 | - gsettings-desktop-schemas (>= 3.9.91), |
218 | + gnome-settings-daemon (>= 3.13.91), |
219 | + gsettings-desktop-schemas (>= 3.13.91), |
220 | Recommends: cups-pk-helper, |
221 | gnome-control-center-shared-data, |
222 | # gnome-session-bin, |
223 | @@ -89,7 +87,6 @@ |
224 | iso-codes, |
225 | libcanberra-pulse, |
226 | mousetweaks, |
227 | - ntp, |
228 | policykit-1-gnome, |
229 | system-config-printer-gnome, |
230 | cracklib-runtime, |
231 | |
232 | === added file 'debian/patches/30_stack_overflow.patch' |
233 | --- debian/patches/30_stack_overflow.patch 1970-01-01 00:00:00 +0000 |
234 | +++ debian/patches/30_stack_overflow.patch 2014-12-20 20:42:39 +0000 |
235 | @@ -0,0 +1,30 @@ |
236 | +From f5be9cccd8e78970d25fa3559128e827f9924651 Mon Sep 17 00:00:00 2001 |
237 | +From: Rui Matos <tiagomatos@gmail.com> |
238 | +Date: Mon, 10 Nov 2014 15:06:52 +0100 |
239 | +Subject: sharing: Prevent an endless loop and resulting stack overflow |
240 | + |
241 | +We need to block ourselves around the gtk_switch_set_active() call in |
242 | +the error path, when we can't speak to the sharing dbus service, or we |
243 | +end up in an endless loop since we're the ::state-set handler. |
244 | + |
245 | +https://bugzilla.gnome.org/show_bug.cgi?id=739886 |
246 | + |
247 | +diff --git a/panels/sharing/cc-sharing-networks.c b/panels/sharing/cc-sharing-networks.c |
248 | +index 181ed99..10920de 100644 |
249 | +--- a/panels/sharing/cc-sharing-networks.c |
250 | ++++ b/panels/sharing/cc-sharing-networks.c |
251 | +@@ -190,7 +190,11 @@ cc_sharing_networks_enable_network (GtkSwitch *widget, |
252 | + g_warning ("Failed to %s service %s: %s", state ? "enable" : "disable", |
253 | + self->priv->service_name, error->message); |
254 | + g_error_free (error); |
255 | ++ g_signal_handlers_block_by_func (widget, |
256 | ++ cc_sharing_networks_enable_network, self); |
257 | + gtk_switch_set_active (widget, !state); |
258 | ++ g_signal_handlers_unblock_by_func (widget, |
259 | ++ cc_sharing_networks_enable_network, self); |
260 | + } |
261 | + |
262 | + cc_sharing_update_networks (self); |
263 | +-- |
264 | +cgit v0.10.1 |
265 | + |
266 | |
267 | === added file 'debian/patches/31_printers_border.patch' |
268 | --- debian/patches/31_printers_border.patch 1970-01-01 00:00:00 +0000 |
269 | +++ debian/patches/31_printers_border.patch 2014-12-20 20:42:39 +0000 |
270 | @@ -0,0 +1,25 @@ |
271 | +From cc0ce5f2c6d52f799707a612832f3715572eeab9 Mon Sep 17 00:00:00 2001 |
272 | +From: Marek Kasik <mkasik@redhat.com> |
273 | +Date: Thu, 27 Nov 2014 15:06:47 +0100 |
274 | +Subject: printers: Remove border around model name |
275 | + |
276 | +The border was not there in 3.10 and it is not |
277 | +intended to be there in 3.14. |
278 | + |
279 | +https://bugzilla.gnome.org/show_bug.cgi?id=740811 |
280 | + |
281 | +diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui |
282 | +index ecb545f..3891c35 100644 |
283 | +--- a/panels/printers/printers.ui |
284 | ++++ b/panels/printers/printers.ui |
285 | +@@ -332,6 +332,7 @@ |
286 | + <property name="visible">True</property> |
287 | + <property name="can_focus">True</property> |
288 | + <property name="show_tabs">False</property> |
289 | ++ <property name="show_border">False</property> |
290 | + <child> |
291 | + <object class="GtkButton" id="printer-model-button"> |
292 | + <property name="use_action_appearance">False</property> |
293 | +-- |
294 | +cgit v0.10.1 |
295 | + |
296 | |
297 | === modified file 'debian/patches/52_region_language.patch' |
298 | --- debian/patches/52_region_language.patch 2014-09-23 23:45:16 +0000 |
299 | +++ debian/patches/52_region_language.patch 2014-12-20 20:42:39 +0000 |
300 | @@ -52,18 +52,18 @@ |
301 | Subject: [PATCH] Ubuntu changes required for proper region support. |
302 | |
303 | --- |
304 | - panels/common/cc-common-language.c | 110 +++++++++++++++++++++++++++--- |
305 | - panels/common/cc-common-language.h | 3 + |
306 | - panels/common/cc-language-chooser.c | 5 +- |
307 | - panels/region/cc-format-chooser.c | 2 + |
308 | - panels/region/cc-input-chooser.c | 4 +- |
309 | - panels/region/cc-region-panel.c | 127 ++++++++++++++++++++++++++--------- |
310 | - panels/user-accounts/um-user-panel.c | 11 ++- |
311 | - 7 files changed, 216 insertions(+), 46 deletions(-) |
312 | + panels/common/cc-common-language.c | 112 +++++++++++++++++++++++++++--- |
313 | + panels/common/cc-common-language.h | 3 |
314 | + panels/common/cc-language-chooser.c | 5 - |
315 | + panels/region/cc-format-chooser.c | 2 |
316 | + panels/region/cc-input-chooser.c | 6 - |
317 | + panels/region/cc-region-panel.c | 129 ++++++++++++++++++++++++++--------- |
318 | + panels/user-accounts/um-user-panel.c | 7 + |
319 | + 7 files changed, 218 insertions(+), 46 deletions(-) |
320 | |
321 | --- a/panels/common/cc-common-language.c |
322 | +++ b/panels/common/cc-common-language.c |
323 | -@@ -321,6 +321,67 @@ |
324 | +@@ -320,6 +320,67 @@ cc_common_language_get_current_language |
325 | return language; |
326 | } |
327 | |
328 | @@ -131,7 +131,7 @@ |
329 | typedef struct { |
330 | GtkListStore *store; |
331 | gboolean user_lang; |
332 | -@@ -428,7 +489,7 @@ |
333 | +@@ -427,7 +488,7 @@ cc_common_language_select_current_langua |
334 | char *lang; |
335 | gboolean found; |
336 | |
337 | @@ -140,7 +140,7 @@ |
338 | g_debug ("Trying to select lang '%s' in treeview", lang); |
339 | model = gtk_tree_view_get_model (treeview); |
340 | found = FALSE; |
341 | -@@ -518,6 +579,7 @@ |
342 | +@@ -517,6 +578,7 @@ get_lang_for_user_object_path (const cha |
343 | return lang; |
344 | } |
345 | |
346 | @@ -148,7 +148,7 @@ |
347 | static void |
348 | add_other_users_language (GHashTable *ht) |
349 | { |
350 | -@@ -578,6 +640,7 @@ |
351 | +@@ -577,6 +639,7 @@ add_other_users_language (GHashTable *ht |
352 | |
353 | g_object_unref (proxy); |
354 | } |
355 | @@ -156,7 +156,7 @@ |
356 | |
357 | static void |
358 | insert_language (GHashTable *ht, |
359 | -@@ -601,10 +664,10 @@ |
360 | +@@ -600,10 +663,10 @@ insert_language (GHashTable *ht, |
361 | |
362 | g_debug ("We have translations for %s", lang); |
363 | |
364 | @@ -169,7 +169,7 @@ |
365 | |
366 | label_own_lang = gnome_get_language_from_locale (key, key); |
367 | label_current_lang = gnome_get_language_from_locale (key, NULL); |
368 | -@@ -630,9 +693,18 @@ |
369 | +@@ -629,9 +692,18 @@ GHashTable * |
370 | cc_common_language_get_initial_languages (void) |
371 | { |
372 | GHashTable *ht; |
373 | @@ -188,7 +188,7 @@ |
374 | insert_language (ht, "en_US"); |
375 | insert_language (ht, "en_GB"); |
376 | insert_language (ht, "de_DE"); |
377 | -@@ -642,7 +714,7 @@ |
378 | +@@ -641,7 +713,7 @@ cc_common_language_get_initial_languages |
379 | insert_language (ht, "ja_JP"); |
380 | insert_language (ht, "ru_RU"); |
381 | insert_language (ht, "ar_EG"); |
382 | @@ -197,7 +197,7 @@ |
383 | return ht; |
384 | } |
385 | |
386 | -@@ -656,10 +728,10 @@ |
387 | +@@ -655,10 +727,10 @@ cc_common_language_get_user_languages (v |
388 | ht = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); |
389 | |
390 | /* Add the languages used by other users on the system */ |
391 | @@ -210,7 +210,7 @@ |
392 | if (g_hash_table_lookup (ht, name) == NULL) { |
393 | language = gnome_get_language_from_locale (name, NULL); |
394 | g_hash_table_insert (ht, name, language); |
395 | -@@ -708,6 +780,28 @@ |
396 | +@@ -707,6 +779,28 @@ cc_common_language_get_initial_regions ( |
397 | return ht; |
398 | } |
399 | |
400 | @@ -239,7 +239,7 @@ |
401 | static void |
402 | foreach_user_lang_cb (gpointer key, |
403 | gpointer value, |
404 | -@@ -739,7 +833,7 @@ |
405 | +@@ -738,7 +832,7 @@ cc_common_language_add_user_languages (G |
406 | user_langs = cc_common_language_get_initial_languages (); |
407 | |
408 | /* Add the current locale first */ |
409 | @@ -248,7 +248,7 @@ |
410 | display = g_hash_table_lookup (user_langs, name); |
411 | if (!display) { |
412 | insert_language (user_langs, name); |
413 | -@@ -755,8 +849,8 @@ |
414 | +@@ -754,8 +848,8 @@ cc_common_language_add_user_languages (G |
415 | g_hash_table_foreach (user_langs, (GHFunc) foreach_user_lang_cb, store); |
416 | |
417 | /* And now the "Other…" selection */ |
418 | @@ -261,7 +261,7 @@ |
419 | } |
420 | --- a/panels/common/cc-common-language.h |
421 | +++ b/panels/common/cc-common-language.h |
422 | -@@ -45,6 +45,7 @@ |
423 | +@@ -44,6 +44,7 @@ guint cc_common_language_add_availabl |
424 | GHashTable *user_langs); |
425 | gboolean cc_common_language_has_font (const gchar *locale); |
426 | gchar *cc_common_language_get_current_language (void); |
427 | @@ -269,7 +269,7 @@ |
428 | |
429 | GHashTable *cc_common_language_get_initial_languages (void); |
430 | GHashTable *cc_common_language_get_user_languages (void); |
431 | -@@ -57,6 +58,8 @@ |
432 | +@@ -56,6 +57,8 @@ void cc_common_language_select_curre |
433 | |
434 | void cc_common_language_add_user_languages (GtkTreeModel *model); |
435 | |
436 | @@ -287,7 +287,7 @@ |
437 | * Copyright (C) 2013 Red Hat, Inc |
438 | * |
439 | * This program is free software; you can redistribute it and/or modify |
440 | -@@ -335,7 +334,9 @@ |
441 | +@@ -334,7 +333,9 @@ set_locale_id (GtkDialog *chooser, |
442 | gtk_list_box_invalidate_filter (GTK_LIST_BOX (priv->language_list)); |
443 | } |
444 | } else { |
445 | @@ -299,7 +299,7 @@ |
446 | g_list_free (children); |
447 | --- a/panels/region/cc-format-chooser.c |
448 | +++ b/panels/region/cc-format-chooser.c |
449 | -@@ -168,7 +168,9 @@ |
450 | +@@ -167,7 +167,9 @@ set_locale_id (GtkDialog *chooser, |
451 | |
452 | } else { |
453 | /* mark as unselected */ |
454 | @@ -311,7 +311,7 @@ |
455 | g_list_free (children); |
456 | --- a/panels/region/cc-input-chooser.c |
457 | +++ b/panels/region/cc-input-chooser.c |
458 | -@@ -891,7 +891,7 @@ |
459 | +@@ -897,7 +897,7 @@ get_ibus_locale_infos (GtkWidget *choose |
460 | lang_code != NULL && |
461 | country_code != NULL) |
462 | { |
463 | @@ -320,18 +320,21 @@ |
464 | |
465 | info = g_hash_table_lookup (priv->locales, locale); |
466 | if (info) |
467 | -@@ -1016,7 +1016,7 @@ |
468 | - if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL)) |
469 | +@@ -1023,9 +1023,9 @@ get_locale_infos (GtkWidget *chooser) |
470 | continue; |
471 | |
472 | -- simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code); |
473 | -+ simple_locale = g_strdup_printf ("%s_%s.UTF-8", lang_code, country_code); |
474 | + if (country_code != NULL) |
475 | +- simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code); |
476 | ++ simple_locale = g_strdup_printf ("%s_%s.UTF-8", lang_code, country_code); |
477 | + else |
478 | +- simple_locale = g_strdup_printf ("%s.utf8", lang_code); |
479 | ++ simple_locale = g_strdup_printf ("%s.UTF-8", lang_code); |
480 | + |
481 | if (g_hash_table_contains (priv->locales, simple_locale)) |
482 | { |
483 | - g_free (simple_locale); |
484 | --- a/panels/region/cc-region-panel.c |
485 | +++ b/panels/region/cc-region-panel.c |
486 | -@@ -424,6 +424,47 @@ |
487 | +@@ -406,6 +406,47 @@ set_system_region (CcRegionPanel *self, |
488 | } |
489 | |
490 | static void |
491 | @@ -379,7 +382,7 @@ |
492 | update_region (CcRegionPanel *self, |
493 | const gchar *region) |
494 | { |
495 | -@@ -434,6 +475,7 @@ |
496 | +@@ -416,6 +457,7 @@ update_region (CcRegionPanel *self, |
497 | } else { |
498 | if (g_strcmp0 (region, priv->region) == 0) |
499 | return; |
500 | @@ -387,7 +390,7 @@ |
501 | g_settings_set_string (priv->locale_settings, KEY_REGION, region); |
502 | if (priv->login_auto_apply) |
503 | set_system_region (self, region); |
504 | -@@ -595,7 +637,7 @@ |
505 | +@@ -577,7 +619,7 @@ update_region_from_setting (CcRegionPane |
506 | CcRegionPanelPrivate *priv = self->priv; |
507 | |
508 | g_free (priv->region); |
509 | @@ -396,7 +399,7 @@ |
510 | update_region_label (self); |
511 | } |
512 | |
513 | -@@ -628,15 +670,17 @@ |
514 | +@@ -610,15 +652,17 @@ static void |
515 | update_language_from_user (CcRegionPanel *self) |
516 | { |
517 | CcRegionPanelPrivate *priv = self->priv; |
518 | @@ -418,7 +421,7 @@ |
519 | update_language_label (self); |
520 | } |
521 | |
522 | -@@ -1484,6 +1528,16 @@ |
523 | +@@ -1442,6 +1486,16 @@ setup_input_section (CcRegionPanel *self |
524 | update_buttons (self); |
525 | } |
526 | |
527 | @@ -435,7 +438,7 @@ |
528 | static void |
529 | on_localed_properties_changed (GDBusProxy *proxy, |
530 | GVariant *changed_properties, |
531 | -@@ -1498,34 +1552,50 @@ |
532 | +@@ -1456,34 +1510,50 @@ on_localed_properties_changed (GDBusProx |
533 | const gchar **strv; |
534 | gsize len; |
535 | gint i; |
536 | @@ -496,7 +499,7 @@ |
537 | |
538 | update_language_label (self); |
539 | } |
540 | -@@ -1595,29 +1665,28 @@ |
541 | +@@ -1553,29 +1623,28 @@ set_localed_locale (CcRegionPanel *self) |
542 | CcRegionPanelPrivate *priv = self->priv; |
543 | GVariantBuilder *b; |
544 | gchar *s; |
545 | @@ -542,45 +545,34 @@ |
546 | g_variant_new ("(asb)", b, TRUE), |
547 | --- a/panels/user-accounts/um-user-panel.c |
548 | +++ b/panels/user-accounts/um-user-panel.c |
549 | -@@ -701,8 +701,9 @@ |
550 | +@@ -704,8 +704,9 @@ show_user (ActUser *user, CcUserPanelPri |
551 | cc_common_language_add_user_languages (model); |
552 | |
553 | lang = g_strdup (act_user_get_language (user)); |
554 | + cc_common_language_get_locale (lang, &lang); |
555 | - if (!lang) |
556 | + if ((!lang || *lang == '\0') && act_user_get_uid (user) == getuid ()) { |
557 | - lang = cc_common_language_get_current_language (); |
558 | + lang = cc_common_language_get_property ("Language"); |
559 | - if (cc_common_language_get_iter_for_language (model, lang, &iter)) |
560 | - um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter); |
561 | - g_free (lang); |
562 | -@@ -828,8 +829,9 @@ |
563 | - } |
564 | - else { |
565 | - lang = g_strdup (act_user_get_language (user)); |
566 | -+ cc_common_language_get_locale (lang, &lang); |
567 | - if (!lang) { |
568 | -- lang = cc_common_language_get_current_language (); |
569 | -+ lang = cc_common_language_get_property ("Language"); |
570 | - } |
571 | - } |
572 | - cc_common_language_get_iter_for_language (model, lang, &iter); |
573 | -@@ -849,6 +851,7 @@ |
574 | + act_user_set_language (user, lang); |
575 | + } |
576 | + |
577 | +@@ -925,6 +926,7 @@ language_changed (UmEditableCombo *co |
578 | GtkTreeModel *model; |
579 | GtkTreeIter iter; |
580 | gchar *lang; |
581 | + gchar *locale; |
582 | + const gchar *current_language; |
583 | ActUser *user; |
584 | - |
585 | - if (!um_editable_combo_get_active_iter (combo, &iter)) |
586 | -@@ -859,8 +862,10 @@ |
587 | + gboolean self_selected; |
588 | +@@ -939,9 +941,10 @@ language_changed (UmEditableCombo *co |
589 | model = um_editable_combo_get_model (combo); |
590 | |
591 | gtk_tree_model_get (model, &iter, 0, &lang, -1); |
592 | + cc_common_language_get_locale(act_user_get_language (user),&locale); |
593 | -+ |
594 | + |
595 | if (lang) { |
596 | -- if (g_strcmp0 (lang, act_user_get_language (user)) != 0) { |
597 | +- if (g_strcmp0 (lang, current_language) != 0) { |
598 | + if (g_strcmp0 (lang, locale) != 0) { |
599 | act_user_set_language (user, lang); |
600 | - } |
601 | - g_free (lang); |
602 | + |
603 | + if (self_selected) |
604 | |
605 | === modified file 'debian/patches/56_use_ubuntu_info_branding.patch' |
606 | --- debian/patches/56_use_ubuntu_info_branding.patch 2014-05-06 09:05:08 +0000 |
607 | +++ debian/patches/56_use_ubuntu_info_branding.patch 2014-12-20 20:42:39 +0000 |
608 | @@ -1,6 +1,8 @@ |
609 | ---- a/panels/info/cc-info-panel.c |
610 | -+++ b/panels/info/cc-info-panel.c |
611 | -@@ -1561,6 +1561,8 @@ |
612 | +Index: gnome-control-center/panels/info/cc-info-panel.c |
613 | +=================================================================== |
614 | +--- gnome-control-center.orig/panels/info/cc-info-panel.c |
615 | ++++ gnome-control-center/panels/info/cc-info-panel.c |
616 | +@@ -1481,6 +1481,8 @@ info_panel_setup_overview (CcInfoPanel |
617 | g_free (text); |
618 | } |
619 | |
620 | @@ -9,19 +11,23 @@ |
621 | glibtop_get_mem (&mem); |
622 | text = g_format_size_full (mem.total, G_FORMAT_SIZE_IEC_UNITS); |
623 | widget = WID ("memory_label"); |
624 | ---- a/panels/info/info.ui |
625 | -+++ b/panels/info/info.ui |
626 | -@@ -243,7 +243,7 @@ |
627 | +Index: gnome-control-center/panels/info/info.ui |
628 | +=================================================================== |
629 | +--- gnome-control-center.orig/panels/info/info.ui |
630 | ++++ gnome-control-center/panels/info/info.ui |
631 | +@@ -205,7 +205,7 @@ |
632 | <object class="GtkImage" id="system_image"> |
633 | <property name="visible">True</property> |
634 | <property name="can_focus">False</property> |
635 | -- <property name="pixbuf">GnomeLogoVerticalMedium.svg</property> |
636 | +- <property name="resource">/org/gnome/control-center/info/GnomeLogoVerticalMedium.svg</property> |
637 | + <property name="pixbuf">UbuntuLogo.png</property> |
638 | </object> |
639 | <packing> |
640 | <property name="expand">False</property> |
641 | ---- a/panels/info/info.gresource.xml |
642 | -+++ b/panels/info/info.gresource.xml |
643 | +Index: gnome-control-center/panels/info/info.gresource.xml |
644 | +=================================================================== |
645 | +--- gnome-control-center.orig/panels/info/info.gresource.xml |
646 | ++++ gnome-control-center/panels/info/info.gresource.xml |
647 | @@ -3,5 +3,6 @@ |
648 | <gresource prefix="/org/gnome/control-center/info"> |
649 | <file preprocess="xml-stripblanks">info.ui</file> |
650 | |
651 | === added file 'debian/patches/gcc_not_in_unity.patch' |
652 | --- debian/patches/gcc_not_in_unity.patch 1970-01-01 00:00:00 +0000 |
653 | +++ debian/patches/gcc_not_in_unity.patch 2014-12-20 20:42:39 +0000 |
654 | @@ -0,0 +1,182 @@ |
655 | +Index: gnome-control-center/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in |
656 | +=================================================================== |
657 | +--- gnome-control-center.orig/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in |
658 | ++++ gnome-control-center/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in |
659 | +@@ -7,7 +7,7 @@ Terminal=false |
660 | + Type=Application |
661 | + NoDisplay=true |
662 | + Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel; |
663 | +-OnlyShowIn=GNOME;Unity; |
664 | ++OnlyShowIn=GNOME; |
665 | + StartupNotify=true |
666 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
667 | + X-GNOME-Bugzilla-Product=gnome-bluetooth |
668 | +Index: gnome-control-center/panels/color/gnome-color-panel.desktop.in.in |
669 | +=================================================================== |
670 | +--- gnome-control-center.orig/panels/color/gnome-color-panel.desktop.in.in |
671 | ++++ gnome-control-center/panels/color/gnome-color-panel.desktop.in.in |
672 | +@@ -8,7 +8,7 @@ Type=Application |
673 | + NoDisplay=true |
674 | + StartupNotify=true |
675 | + Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;HardwareSettings; |
676 | +-OnlyShowIn=GNOME;Unity; |
677 | ++OnlyShowIn=GNOME |
678 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
679 | + X-GNOME-Bugzilla-Product=gnome-control-center |
680 | + X-GNOME-Bugzilla-Component=color |
681 | +Index: gnome-control-center/panels/display/gnome-display-panel.desktop.in.in |
682 | +=================================================================== |
683 | +--- gnome-control-center.orig/panels/display/gnome-display-panel.desktop.in.in |
684 | ++++ gnome-control-center/panels/display/gnome-display-panel.desktop.in.in |
685 | +@@ -8,7 +8,7 @@ Type=Application |
686 | + NoDisplay=true |
687 | + StartupNotify=true |
688 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
689 | +-OnlyShowIn=GNOME;Unity; |
690 | ++OnlyShowIn=GNOME; |
691 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
692 | + X-GNOME-Bugzilla-Product=gnome-control-center |
693 | + X-GNOME-Bugzilla-Component=Screen resolution |
694 | +Index: gnome-control-center/panels/info/gnome-info-panel.desktop.in.in |
695 | +=================================================================== |
696 | +--- gnome-control-center.orig/panels/info/gnome-info-panel.desktop.in.in |
697 | ++++ gnome-control-center/panels/info/gnome-info-panel.desktop.in.in |
698 | +@@ -8,7 +8,7 @@ Type=Application |
699 | + NoDisplay=true |
700 | + StartupNotify=true |
701 | + Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; |
702 | +-OnlyShowIn=GNOME;Unity; |
703 | ++OnlyShowIn=GNOME; |
704 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
705 | + X-GNOME-Bugzilla-Product=gnome-control-center |
706 | + X-GNOME-Bugzilla-Component=info |
707 | +Index: gnome-control-center/panels/keyboard/gnome-keyboard-panel.desktop.in.in |
708 | +=================================================================== |
709 | +--- gnome-control-center.orig/panels/keyboard/gnome-keyboard-panel.desktop.in.in |
710 | ++++ gnome-control-center/panels/keyboard/gnome-keyboard-panel.desktop.in.in |
711 | +@@ -8,7 +8,7 @@ Type=Application |
712 | + NoDisplay=true |
713 | + StartupNotify=true |
714 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
715 | +-OnlyShowIn=GNOME;Unity; |
716 | ++OnlyShowIn=GNOME; |
717 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
718 | + X-GNOME-Bugzilla-Product=gnome-control-center |
719 | + X-GNOME-Bugzilla-Component=keyboard |
720 | +Index: gnome-control-center/panels/mouse/gnome-mouse-panel.desktop.in.in |
721 | +=================================================================== |
722 | +--- gnome-control-center.orig/panels/mouse/gnome-mouse-panel.desktop.in.in |
723 | ++++ gnome-control-center/panels/mouse/gnome-mouse-panel.desktop.in.in |
724 | +@@ -8,7 +8,7 @@ Type=Application |
725 | + NoDisplay=true |
726 | + StartupNotify=true |
727 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
728 | +-OnlyShowIn=GNOME;Unity; |
729 | ++OnlyShowIn=GNOME; |
730 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
731 | + X-GNOME-Bugzilla-Product=gnome-control-center |
732 | + X-GNOME-Bugzilla-Component=mouse |
733 | +Index: gnome-control-center/panels/network/gnome-network-panel.desktop.in.in |
734 | +=================================================================== |
735 | +--- gnome-control-center.orig/panels/network/gnome-network-panel.desktop.in.in |
736 | ++++ gnome-control-center/panels/network/gnome-network-panel.desktop.in.in |
737 | +@@ -8,7 +8,7 @@ Type=Application |
738 | + NoDisplay=true |
739 | + StartupNotify=true |
740 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
741 | +-OnlyShowIn=GNOME;Unity; |
742 | ++OnlyShowIn=GNOME; |
743 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
744 | + X-GNOME-Bugzilla-Product=gnome-control-center |
745 | + X-GNOME-Bugzilla-Component=network |
746 | +Index: gnome-control-center/panels/power/gnome-power-panel.desktop.in.in |
747 | +=================================================================== |
748 | +--- gnome-control-center.orig/panels/power/gnome-power-panel.desktop.in.in |
749 | ++++ gnome-control-center/panels/power/gnome-power-panel.desktop.in.in |
750 | +@@ -8,7 +8,7 @@ Type=Application |
751 | + NoDisplay=true |
752 | + StartupNotify=true |
753 | + Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;HardwareSettings; |
754 | +-OnlyShowIn=GNOME;Unity; |
755 | ++OnlyShowIn=GNOME; |
756 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
757 | + X-GNOME-Bugzilla-Product=gnome-control-center |
758 | + X-GNOME-Bugzilla-Component=power |
759 | +Index: gnome-control-center/panels/universal-access/gnome-universal-access-panel.desktop.in.in |
760 | +=================================================================== |
761 | +--- gnome-control-center.orig/panels/universal-access/gnome-universal-access-panel.desktop.in.in |
762 | ++++ gnome-control-center/panels/universal-access/gnome-universal-access-panel.desktop.in.in |
763 | +@@ -8,7 +8,7 @@ Type=Application |
764 | + NoDisplay=true |
765 | + StartupNotify=true |
766 | + Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; |
767 | +-OnlyShowIn=GNOME;Unity; |
768 | ++OnlyShowIn=GNOME; |
769 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
770 | + X-GNOME-Bugzilla-Product=gnome-control-center |
771 | + X-GNOME-Bugzilla-Component=Universal Access |
772 | +Index: gnome-control-center/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in |
773 | +=================================================================== |
774 | +--- gnome-control-center.orig/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in |
775 | ++++ gnome-control-center/panels/user-accounts/data/gnome-user-accounts-panel.desktop.in.in |
776 | +@@ -8,7 +8,7 @@ Type=Application |
777 | + NoDisplay=true |
778 | + StartupNotify=true |
779 | + Categories=System;Settings;X-GNOME-Settings-Panel;X-GNOME-SystemSettings; |
780 | +-OnlyShowIn=GNOME;Unity; |
781 | ++OnlyShowIn=GNOME; |
782 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
783 | + X-GNOME-Bugzilla-Product=gnome-control-center |
784 | + X-GNOME-Bugzilla-Component=user-accounts |
785 | +Index: gnome-control-center/panels/wacom/gnome-wacom-panel.desktop.in.in |
786 | +=================================================================== |
787 | +--- gnome-control-center.orig/panels/wacom/gnome-wacom-panel.desktop.in.in |
788 | ++++ gnome-control-center/panels/wacom/gnome-wacom-panel.desktop.in.in |
789 | +@@ -8,7 +8,7 @@ Type=Application |
790 | + NoDisplay=true |
791 | + StartupNotify=true |
792 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
793 | +-OnlyShowIn=GNOME;Unity; |
794 | ++OnlyShowIn=GNOME; |
795 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
796 | + X-GNOME-Bugzilla-Product=gnome-control-center |
797 | + X-GNOME-Bugzilla-Component=wacom |
798 | +Index: gnome-control-center/shell/gnome-control-center.desktop.in.in |
799 | +=================================================================== |
800 | +--- gnome-control-center.orig/shell/gnome-control-center.desktop.in.in |
801 | ++++ gnome-control-center/shell/gnome-control-center.desktop.in.in |
802 | +@@ -6,7 +6,7 @@ Terminal=false |
803 | + Type=Application |
804 | + StartupNotify=true |
805 | + Categories=GNOME;GTK;System; |
806 | +-OnlyShowIn=GNOME;Unity; |
807 | ++OnlyShowIn=GNOME; |
808 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
809 | + X-GNOME-Bugzilla-Product=gnome-control-center |
810 | + X-GNOME-Bugzilla-Component=shell |
811 | +Index: gnome-control-center/panels/region/gnome-region-panel.desktop.in.in |
812 | +=================================================================== |
813 | +--- gnome-control-center.orig/panels/region/gnome-region-panel.desktop.in.in |
814 | ++++ gnome-control-center/panels/region/gnome-region-panel.desktop.in.in |
815 | +@@ -8,7 +8,7 @@ Type=Application |
816 | + NoDisplay=true |
817 | + StartupNotify=true |
818 | + Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings; |
819 | +-OnlyShowIn=GNOME;Unity; |
820 | ++OnlyShowIn=GNOME; |
821 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
822 | + X-GNOME-Bugzilla-Product=gnome-control-center |
823 | + X-GNOME-Bugzilla-Component=region |
824 | +Index: gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in |
825 | +=================================================================== |
826 | +--- gnome-control-center.orig/panels/sound/data/gnome-sound-panel.desktop.in.in |
827 | ++++ gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in |
828 | +@@ -8,7 +8,7 @@ Type=Application |
829 | + NoDisplay=true |
830 | + StartupNotify=true |
831 | + Categories=GNOME;GTK;Settings;HardwareSettings;X-GNOME-Settings-Panel; |
832 | +-OnlyShowIn=GNOME;Unity; |
833 | ++OnlyShowIn=GNOME; |
834 | + X-GNOME-Bugzilla-Bugzilla=GNOME |
835 | + X-GNOME-Bugzilla-Product=gnome-control-center |
836 | + X-GNOME-Bugzilla-Component=sound |
837 | |
838 | === removed file 'debian/patches/revert_automatic_timezone.patch' |
839 | --- debian/patches/revert_automatic_timezone.patch 2014-09-30 23:17:03 +0000 |
840 | +++ debian/patches/revert_automatic_timezone.patch 1970-01-01 00:00:00 +0000 |
841 | @@ -1,105 +0,0 @@ |
842 | -From 6f07b9014326e3234af305743c94018117a6001b Mon Sep 17 00:00:00 2001 |
843 | -From: Tim Lunn <tim@feathertop.org> |
844 | -Date: Wed, 1 Oct 2014 08:04:06 +1000 |
845 | -Subject: [PATCH] Revert "datetime: Show the automatic timezone switch" |
846 | - |
847 | -This reverts commit c68f9eca501b662fd819bab1ae021098a7cdaf9b. |
848 | ---- |
849 | - panels/datetime/cc-datetime-panel.c | 25 ++----------------------- |
850 | - panels/datetime/datetime.ui | 1 - |
851 | - 2 files changed, 2 insertions(+), 24 deletions(-) |
852 | - |
853 | -diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c |
854 | -index ec76d22..ec3cf0c 100644 |
855 | ---- a/panels/datetime/cc-datetime-panel.c |
856 | -+++ b/panels/datetime/cc-datetime-panel.c |
857 | -@@ -64,9 +64,6 @@ enum { |
858 | - |
859 | - #define FILECHOOSER_SCHEMA "org.gtk.Settings.FileChooser" |
860 | - |
861 | --#define DATETIME_SCHEMA "org.gnome.desktop.datetime" |
862 | --#define AUTO_TIMEZONE_KEY "automatic-timezone" |
863 | -- |
864 | - struct _CcDateTimePanelPrivate |
865 | - { |
866 | - GtkBuilder *builder; |
867 | -@@ -83,7 +80,6 @@ struct _CcDateTimePanelPrivate |
868 | - GDateTime *date; |
869 | - |
870 | - GSettings *clock_settings; |
871 | -- GSettings *datetime_settings; |
872 | - GSettings *filechooser_settings; |
873 | - GDesktopClockFormat clock_format; |
874 | - gboolean ampm_available; |
875 | -@@ -133,7 +129,6 @@ cc_date_time_panel_dispose (GObject *object) |
876 | - g_clear_object (&priv->dtm); |
877 | - g_clear_object (&priv->permission); |
878 | - g_clear_object (&priv->clock_settings); |
879 | -- g_clear_object (&priv->datetime_settings); |
880 | - g_clear_object (&priv->filechooser_settings); |
881 | - |
882 | - g_clear_pointer (&priv->date, g_date_time_unref); |
883 | -@@ -752,17 +747,15 @@ on_permission_changed (GPermission *permission, |
884 | - gpointer data) |
885 | - { |
886 | - CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv; |
887 | -- gboolean allowed, auto_timezone, using_ntp; |
888 | -+ gboolean allowed, using_ntp; |
889 | - |
890 | - allowed = (priv->permission == NULL || g_permission_get_allowed (priv->permission)); |
891 | - using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch"))); |
892 | -- auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch"))); |
893 | - |
894 | - /* All the widgets but the lock button and the 24h setting */ |
895 | - gtk_widget_set_sensitive (W("auto-datetime-row"), allowed); |
896 | -- gtk_widget_set_sensitive (W("auto-timezone-row"), allowed); |
897 | - gtk_widget_set_sensitive (W("datetime-button"), allowed && !using_ntp); |
898 | -- gtk_widget_set_sensitive (W("timezone-button"), allowed && !auto_timezone); |
899 | -+ gtk_widget_set_sensitive (W("timezone-button"), allowed); |
900 | - |
901 | - /* Hide the subdialogs if we no longer have permissions */ |
902 | - if (!allowed) |
903 | -@@ -953,10 +946,6 @@ list_box_row_activated (GtkListBox *listbox, |
904 | - { |
905 | - toggle_switch (W ("network_time_switch")); |
906 | - } |
907 | -- else if (!g_strcmp0 (widget_name, "auto-timezone-row")) |
908 | -- { |
909 | -- toggle_switch (W ("auto_timezone_switch")); |
910 | -- } |
911 | - else if ((found = g_strrstr (widget_name, "button"))) |
912 | - { |
913 | - /* replace "button" with "dialog" */ |
914 | -@@ -1292,16 +1281,6 @@ cc_date_time_panel_init (CcDateTimePanel *self) |
915 | - g_signal_connect (W("network_time_switch"), "notify::active", |
916 | - G_CALLBACK (change_ntp), self); |
917 | - |
918 | -- /* Timezone settings */ |
919 | -- bind_switch_to_row (self, |
920 | -- W ("auto_timezone_switch"), |
921 | -- W ("timezone-button")); |
922 | -- |
923 | -- priv->datetime_settings = g_settings_new (DATETIME_SCHEMA); |
924 | -- g_settings_bind (priv->datetime_settings, AUTO_TIMEZONE_KEY, |
925 | -- W ("auto_timezone_switch"), "active", |
926 | -- G_SETTINGS_BIND_DEFAULT); |
927 | -- |
928 | - /* Clock settings */ |
929 | - priv->clock_settings = g_settings_new (CLOCK_SCHEMA); |
930 | - |
931 | -diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui |
932 | -index c7cdcf2..0c01db6 100644 |
933 | ---- a/panels/datetime/datetime.ui |
934 | -+++ b/panels/datetime/datetime.ui |
935 | -@@ -548,7 +548,6 @@ |
936 | - <property name="can_focus">True</property> |
937 | - <child> |
938 | - <object class="GtkBox" id="box3"> |
939 | -- <property name="visible">True</property> |
940 | - <property name="can_focus">False</property> |
941 | - <property name="spacing">50</property> |
942 | - <child> |
943 | --- |
944 | -2.1.0 |
945 | - |
946 | - |
947 | |
948 | === removed file 'debian/patches/revert_git_dont_hide_zoom.patch' |
949 | --- debian/patches/revert_git_dont_hide_zoom.patch 2014-09-23 23:45:16 +0000 |
950 | +++ debian/patches/revert_git_dont_hide_zoom.patch 1970-01-01 00:00:00 +0000 |
951 | @@ -1,76 +0,0 @@ |
952 | -From c384570bace7055e5fb6b7e9208086e749fd325d Mon Sep 17 00:00:00 2001 |
953 | -From: Bastien Nocera <hadess@hadess.net> |
954 | -Date: Fri, 09 Nov 2012 13:30:39 +0000 |
955 | -Subject: universal-access: Always show the zoom options |
956 | - |
957 | -Now that the fallback mode is gone. #fallback |
958 | - |
959 | -https://bugzilla.gnome.org/show_bug.cgi?id=682862 |
960 | ---- |
961 | ---- a/panels/universal-access/cc-ua-panel.c |
962 | -+++ b/panels/universal-access/cc-ua-panel.c |
963 | -@@ -102,6 +102,7 @@ |
964 | - GSettings *application_settings; |
965 | - |
966 | - ZoomOptions *zoom_options; |
967 | -+ guint shell_watch_id; |
968 | - |
969 | - GtkAdjustment *focus_adjustment; |
970 | - |
971 | -@@ -116,6 +117,12 @@ |
972 | - { |
973 | - CcUaPanelPrivate *priv = CC_UA_PANEL (object)->priv; |
974 | - |
975 | -+ if (priv->shell_watch_id) |
976 | -+ { |
977 | -+ g_bus_unwatch_name (priv->shell_watch_id); |
978 | -+ priv->shell_watch_id = 0; |
979 | -+ } |
980 | -+ |
981 | - g_clear_object (&priv->builder); |
982 | - g_slist_free_full (priv->toplevels, (GDestroyNotify)gtk_widget_destroy); |
983 | - priv->toplevels = NULL; |
984 | -@@ -177,6 +184,29 @@ |
985 | - return (factor > DPI_FACTOR_NORMAL); |
986 | - } |
987 | - |
988 | -+static void |
989 | -+shell_vanished_cb (GDBusConnection *connection, |
990 | -+ const gchar *name, |
991 | -+ CcUaPanel *self) |
992 | -+{ |
993 | -+ CcUaPanelPrivate *priv = self->priv; |
994 | -+ |
995 | -+ gtk_widget_hide (WID ("zoom_label_box")); |
996 | -+ gtk_widget_hide (WID ("zoom_value_box")); |
997 | -+} |
998 | -+ |
999 | -+static void |
1000 | -+shell_appeared_cb (GDBusConnection *connection, |
1001 | -+ const gchar *name, |
1002 | -+ const gchar *name_owner, |
1003 | -+ CcUaPanel *self) |
1004 | -+{ |
1005 | -+ CcUaPanelPrivate *priv = self->priv; |
1006 | -+ |
1007 | -+ gtk_widget_show (WID ("zoom_label_box")); |
1008 | -+ gtk_widget_show (WID ("zoom_value_box")); |
1009 | -+} |
1010 | -+ |
1011 | - static gboolean |
1012 | - get_large_text_mapping (GValue *value, |
1013 | - GVariant *variant, |
1014 | -@@ -445,6 +475,13 @@ |
1015 | - NULL); |
1016 | - |
1017 | - /* zoom */ |
1018 | -+ priv->shell_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION, |
1019 | -+ "org.gnome.Shell", |
1020 | -+ G_BUS_NAME_WATCHER_FLAGS_NONE, |
1021 | -+ (GBusNameAppearedCallback) shell_appeared_cb, |
1022 | -+ (GBusNameVanishedCallback) shell_vanished_cb, |
1023 | -+ self, |
1024 | -+ NULL); |
1025 | - |
1026 | - g_settings_bind_with_mapping (priv->application_settings, "screen-magnifier-enabled", |
1027 | - WID ("value_zoom"), |
1028 | |
1029 | === modified file 'debian/patches/series' |
1030 | --- debian/patches/series 2014-10-30 11:09:09 +0000 |
1031 | +++ debian/patches/series 2014-12-20 20:42:39 +0000 |
1032 | @@ -2,15 +2,15 @@ |
1033 | #01_menu_category.patch |
1034 | 06_handle_passwd_with_ldap.patch |
1035 | 07_polkit_wheel_sudo_group.patch |
1036 | +30_stack_overflow.patch |
1037 | +31_printers_border.patch |
1038 | 52_region_language.patch |
1039 | 56_use_ubuntu_info_branding.patch |
1040 | 64_restore_terminal_keyboard_shortcut.patch |
1041 | 92_ubuntu_system_proxy.patch |
1042 | 99_add_lock-on-suspend.patch |
1043 | -revert_git_dont_hide_zoom.patch |
1044 | revert_git_drop_library.patch |
1045 | ubuntu_external_panels.patch |
1046 | ubuntu-gnome-version.patch |
1047 | revert_new_bluetooth.patch |
1048 | revert-bluetooth-BlueZ5-interface.patch |
1049 | -revert_automatic_timezone.patch |
1050 | |
1051 | === modified file 'debian/patches/ubuntu_external_panels.patch' |
1052 | --- debian/patches/ubuntu_external_panels.patch 2014-09-23 23:45:16 +0000 |
1053 | +++ debian/patches/ubuntu_external_panels.patch 2014-12-20 20:42:39 +0000 |
1054 | @@ -23,10 +23,10 @@ |
1055 | shell/cc-window.c | 95 ++++++++++++++++++++++++++++++++++++++++ |
1056 | 6 files changed, 220 insertions(+), 2 deletions(-) |
1057 | |
1058 | -Index: gnome-control-center-3.12.1/configure.ac |
1059 | +Index: gnome-control-center/configure.ac |
1060 | =================================================================== |
1061 | ---- gnome-control-center-3.12.1.orig/configure.ac |
1062 | -+++ gnome-control-center-3.12.1/configure.ac |
1063 | +--- gnome-control-center.orig/configure.ac |
1064 | ++++ gnome-control-center/configure.ac |
1065 | @@ -339,6 +339,9 @@ dnl ==================================== |
1066 | dnl Panels |
1067 | dnl ======================================= |
1068 | @@ -37,24 +37,21 @@ |
1069 | PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\"" |
1070 | AC_SUBST(PANEL_CFLAGS) |
1071 | |
1072 | -Index: gnome-control-center-3.12.1/shell/Makefile.am |
1073 | -=================================================================== |
1074 | ---- gnome-control-center-3.12.1.orig/shell/Makefile.am |
1075 | -+++ gnome-control-center-3.12.1/shell/Makefile.am |
1076 | -@@ -114,7 +114,8 @@ if BUILD_BLUETOOTH |
1077 | - gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
1078 | - endif |
1079 | - |
1080 | --AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" |
1081 | -+AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ |
1082 | -+ -DPANELS_DIR="\"$(PANELS_DIR)\"" |
1083 | - |
1084 | - # Dbus service file |
1085 | - servicefiledir = $(datadir)/dbus-1/services |
1086 | -Index: gnome-control-center-3.12.1/shell/cc-panel-loader.c |
1087 | -=================================================================== |
1088 | ---- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.c |
1089 | -+++ gnome-control-center-3.12.1/shell/cc-panel-loader.c |
1090 | +Index: gnome-control-center/shell/Makefile.am |
1091 | +=================================================================== |
1092 | +--- gnome-control-center.orig/shell/Makefile.am |
1093 | ++++ gnome-control-center/shell/Makefile.am |
1094 | +@@ -1,5 +1,6 @@ |
1095 | + AM_CPPFLAGS = \ |
1096 | + -DGNOMELOCALEDIR="\"$(datadir)/locale\""\ |
1097 | ++ -DPANELS_DIR="\"$(PANELS_DIR)\"" \ |
1098 | + -I$(top_srcdir) \ |
1099 | + $(SHELL_CFLAGS) \ |
1100 | + $(CHEESE_CFLAGS) \ |
1101 | +Index: gnome-control-center/shell/cc-panel-loader.c |
1102 | +=================================================================== |
1103 | +--- gnome-control-center.orig/shell/cc-panel-loader.c |
1104 | ++++ gnome-control-center/shell/cc-panel-loader.c |
1105 | @@ -26,6 +26,19 @@ |
1106 | |
1107 | #include "cc-panel-loader.h" |
1108 | @@ -212,10 +209,10 @@ |
1109 | |
1110 | return g_object_new (get_type (), |
1111 | "shell", shell, |
1112 | -Index: gnome-control-center-3.12.1/shell/cc-panel-loader.h |
1113 | +Index: gnome-control-center/shell/cc-panel-loader.h |
1114 | =================================================================== |
1115 | ---- gnome-control-center-3.12.1.orig/shell/cc-panel-loader.h |
1116 | -+++ gnome-control-center-3.12.1/shell/cc-panel-loader.h |
1117 | +--- gnome-control-center.orig/shell/cc-panel-loader.h |
1118 | ++++ gnome-control-center/shell/cc-panel-loader.h |
1119 | @@ -29,6 +29,7 @@ |
1120 | G_BEGIN_DECLS |
1121 | |
1122 | @@ -224,10 +221,10 @@ |
1123 | GList *cc_panel_loader_get_panels (void); |
1124 | void cc_panel_loader_add_option_groups (GOptionContext *context, |
1125 | GVariantBuilder *builder); |
1126 | -Index: gnome-control-center-3.12.1/shell/cc-panel.h |
1127 | +Index: gnome-control-center/shell/cc-panel.h |
1128 | =================================================================== |
1129 | ---- gnome-control-center-3.12.1.orig/shell/cc-panel.h |
1130 | -+++ gnome-control-center-3.12.1/shell/cc-panel.h |
1131 | +--- gnome-control-center.orig/shell/cc-panel.h |
1132 | ++++ gnome-control-center/shell/cc-panel.h |
1133 | @@ -45,6 +45,14 @@ G_BEGIN_DECLS |
1134 | #define CC_PANEL_REGISTER(PluginName, plugin_name) \ |
1135 | G_DEFINE_TYPE (PluginName, plugin_name, CC_TYPE_PANEL) |
1136 | @@ -243,11 +240,11 @@ |
1137 | typedef struct CcPanelPrivate CcPanelPrivate; |
1138 | |
1139 | typedef struct _CcPanel CcPanel; |
1140 | -Index: gnome-control-center-3.12.1/shell/cc-window.c |
1141 | +Index: gnome-control-center/shell/cc-window.c |
1142 | =================================================================== |
1143 | ---- gnome-control-center-3.12.1.orig/shell/cc-window.c |
1144 | -+++ gnome-control-center-3.12.1/shell/cc-window.c |
1145 | -@@ -100,6 +100,8 @@ struct _CcWindowPrivate |
1146 | +--- gnome-control-center.orig/shell/cc-window.c |
1147 | ++++ gnome-control-center/shell/cc-window.c |
1148 | +@@ -101,6 +101,8 @@ struct _CcWindowPrivate |
1149 | |
1150 | CcPanel *active_panel; |
1151 | |
1152 | @@ -256,7 +253,7 @@ |
1153 | int monitor_num; |
1154 | CcSmallScreen small_screen; |
1155 | }; |
1156 | -@@ -139,6 +141,53 @@ get_icon_name_from_g_icon (GIcon *gicon) |
1157 | +@@ -140,6 +142,53 @@ get_icon_name_from_g_icon (GIcon *gicon) |
1158 | return NULL; |
1159 | } |
1160 | |
1161 | @@ -310,7 +307,7 @@ |
1162 | static gboolean |
1163 | activate_panel (CcWindow *self, |
1164 | const gchar *id, |
1165 | -@@ -154,6 +203,16 @@ activate_panel (CcWindow *self |
1166 | +@@ -155,6 +204,16 @@ activate_panel (CcWindow *self |
1167 | return FALSE; |
1168 | |
1169 | priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); |
1170 | @@ -327,7 +324,7 @@ |
1171 | cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); |
1172 | gtk_widget_show (priv->current_panel); |
1173 | |
1174 | -@@ -874,9 +933,44 @@ setup_model (CcWindow *shell) |
1175 | +@@ -878,9 +937,44 @@ setup_model (CcWindow *shell) |
1176 | add_category_view (shell, CC_CATEGORY_SYSTEM, C_("category", "System")); |
1177 | |
1178 | cc_panel_loader_fill_model (CC_SHELL_MODEL (shell->priv->store)); |
1179 | @@ -372,7 +369,7 @@ |
1180 | previous_button_clicked_cb (GtkButton *button, |
1181 | CcWindow *shell) |
1182 | { |
1183 | -@@ -1447,6 +1541,9 @@ create_main_page (CcWindow *self) |
1184 | +@@ -1452,6 +1546,9 @@ create_main_page (CcWindow *self) |
1185 | |
1186 | gtk_widget_set_size_request (priv->scrolled_window, FIXED_WIDTH, -1); |
1187 |
Thanks Jackson, Looks good.
Can confirm no changes to shared data