Merge lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346-noautotz into lp:~ubuntu-desktop/gnome-control-center/ubuntu

Proposed by Tim Lunn on 2014-09-30
Status: Merged
Approved by: Robert Ancell on 2014-10-01
Approved revision: 649
Merged at revision: 649
Proposed branch: lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346-noautotz
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 133 lines (+113/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/revert_automatic_timezone.patch (+105/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/utopic/gnome-control-center/lp1372346-noautotz
Reviewer Review Type Date Requested Status
Robert Ancell 2014-09-30 Approve on 2014-10-01
Review via email: mp+236641@code.launchpad.net
To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Makes sense.

review: Approve

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-09-30 12:52:05 +0000
3+++ debian/changelog 2014-09-30 23:31:59 +0000
4@@ -1,3 +1,10 @@
5+gnome-control-center (1:3.12.1-5ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/patches/revert_automatic_timezone.patch: datetime plugin
8+ is disabled since it requires geoclue-2.0 which is in universe
9+
10+ -- Tim Lunn <tim@feathertop.org> Wed, 01 Oct 2014 09:02:19 +1000
11+
12 gnome-control-center (1:3.12.1-5ubuntu1) utopic; urgency=medium
13
14 * New Upstream Release (LP: #1372346)
15
16=== added file 'debian/patches/revert_automatic_timezone.patch'
17--- debian/patches/revert_automatic_timezone.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/revert_automatic_timezone.patch 2014-09-30 23:31:59 +0000
19@@ -0,0 +1,105 @@
20+From 6f07b9014326e3234af305743c94018117a6001b Mon Sep 17 00:00:00 2001
21+From: Tim Lunn <tim@feathertop.org>
22+Date: Wed, 1 Oct 2014 08:04:06 +1000
23+Subject: [PATCH] Revert "datetime: Show the automatic timezone switch"
24+
25+This reverts commit c68f9eca501b662fd819bab1ae021098a7cdaf9b.
26+---
27+ panels/datetime/cc-datetime-panel.c | 25 ++-----------------------
28+ panels/datetime/datetime.ui | 1 -
29+ 2 files changed, 2 insertions(+), 24 deletions(-)
30+
31+diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
32+index ec76d22..ec3cf0c 100644
33+--- a/panels/datetime/cc-datetime-panel.c
34++++ b/panels/datetime/cc-datetime-panel.c
35+@@ -64,9 +64,6 @@ enum {
36+
37+ #define FILECHOOSER_SCHEMA "org.gtk.Settings.FileChooser"
38+
39+-#define DATETIME_SCHEMA "org.gnome.desktop.datetime"
40+-#define AUTO_TIMEZONE_KEY "automatic-timezone"
41+-
42+ struct _CcDateTimePanelPrivate
43+ {
44+ GtkBuilder *builder;
45+@@ -83,7 +80,6 @@ struct _CcDateTimePanelPrivate
46+ GDateTime *date;
47+
48+ GSettings *clock_settings;
49+- GSettings *datetime_settings;
50+ GSettings *filechooser_settings;
51+ GDesktopClockFormat clock_format;
52+ gboolean ampm_available;
53+@@ -133,7 +129,6 @@ cc_date_time_panel_dispose (GObject *object)
54+ g_clear_object (&priv->dtm);
55+ g_clear_object (&priv->permission);
56+ g_clear_object (&priv->clock_settings);
57+- g_clear_object (&priv->datetime_settings);
58+ g_clear_object (&priv->filechooser_settings);
59+
60+ g_clear_pointer (&priv->date, g_date_time_unref);
61+@@ -752,17 +747,15 @@ on_permission_changed (GPermission *permission,
62+ gpointer data)
63+ {
64+ CcDateTimePanelPrivate *priv = CC_DATE_TIME_PANEL (data)->priv;
65+- gboolean allowed, auto_timezone, using_ntp;
66++ gboolean allowed, using_ntp;
67+
68+ allowed = (priv->permission == NULL || g_permission_get_allowed (priv->permission));
69+ using_ntp = gtk_switch_get_active (GTK_SWITCH (W("network_time_switch")));
70+- auto_timezone = gtk_switch_get_active (GTK_SWITCH (W("auto_timezone_switch")));
71+
72+ /* All the widgets but the lock button and the 24h setting */
73+ gtk_widget_set_sensitive (W("auto-datetime-row"), allowed);
74+- gtk_widget_set_sensitive (W("auto-timezone-row"), allowed);
75+ gtk_widget_set_sensitive (W("datetime-button"), allowed && !using_ntp);
76+- gtk_widget_set_sensitive (W("timezone-button"), allowed && !auto_timezone);
77++ gtk_widget_set_sensitive (W("timezone-button"), allowed);
78+
79+ /* Hide the subdialogs if we no longer have permissions */
80+ if (!allowed)
81+@@ -953,10 +946,6 @@ list_box_row_activated (GtkListBox *listbox,
82+ {
83+ toggle_switch (W ("network_time_switch"));
84+ }
85+- else if (!g_strcmp0 (widget_name, "auto-timezone-row"))
86+- {
87+- toggle_switch (W ("auto_timezone_switch"));
88+- }
89+ else if ((found = g_strrstr (widget_name, "button")))
90+ {
91+ /* replace "button" with "dialog" */
92+@@ -1292,16 +1281,6 @@ cc_date_time_panel_init (CcDateTimePanel *self)
93+ g_signal_connect (W("network_time_switch"), "notify::active",
94+ G_CALLBACK (change_ntp), self);
95+
96+- /* Timezone settings */
97+- bind_switch_to_row (self,
98+- W ("auto_timezone_switch"),
99+- W ("timezone-button"));
100+-
101+- priv->datetime_settings = g_settings_new (DATETIME_SCHEMA);
102+- g_settings_bind (priv->datetime_settings, AUTO_TIMEZONE_KEY,
103+- W ("auto_timezone_switch"), "active",
104+- G_SETTINGS_BIND_DEFAULT);
105+-
106+ /* Clock settings */
107+ priv->clock_settings = g_settings_new (CLOCK_SCHEMA);
108+
109+diff --git a/panels/datetime/datetime.ui b/panels/datetime/datetime.ui
110+index c7cdcf2..0c01db6 100644
111+--- a/panels/datetime/datetime.ui
112++++ b/panels/datetime/datetime.ui
113+@@ -548,7 +548,6 @@
114+ <property name="can_focus">True</property>
115+ <child>
116+ <object class="GtkBox" id="box3">
117+- <property name="visible">True</property>
118+ <property name="can_focus">False</property>
119+ <property name="spacing">50</property>
120+ <child>
121+--
122+2.1.0
123+
124+
125
126=== modified file 'debian/patches/series'
127--- debian/patches/series 2014-09-30 05:15:58 +0000
128+++ debian/patches/series 2014-09-30 23:31:59 +0000
129@@ -14,3 +14,4 @@
130 ubuntu-gnome-version.patch
131 revert_new_bluetooth.patch
132 revert-bluetooth-BlueZ5-interface.patch
133+revert_automatic_timezone.patch

Subscribers

People subscribed via source and target branches