gnome-control-center

Merge lp:~jamesh/gnome-control-center/ubuntu-bug-1715662 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

  1. ubuntu-bug-1715662
  2. Merge into ubuntu
Proposed by James Henstridge
Status: Merged
Merged at revision: 753
Proposed branch: lp:~jamesh/gnome-control-center/ubuntu-bug-1715662
Merge into: lp:~ubuntu-desktop/gnome-control-center/ubuntu
Diff against target: 114 lines (+23/-13)
2 files modified
debian/changelog (+9/-2)
debian/patches/connectivity-switch.patch (+14/-11)
To merge this branch: bzr merge lp:~jamesh/gnome-control-center/ubuntu-bug-1715662
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+331038@code.launchpad.net

Commit message

Watch the correct property so the connectivity switch updates correctly

Description of the change

Watch the correct property so the connectivity switch in the connectivity checking dialog updates correctly.

To post a comment you must log in.
lp:~jamesh/gnome-control-center/ubuntu-bug-1715662 updated
753. By James Henstridge

debian/patches/connectivity-switch.patch: watch the correct property
so the connectivity switch updates correctly. (LP: #1715662)

Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good, thanks

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 2017-09-14 15:09:53 +0000
3+++ debian/changelog 2017-09-20 09:24:27 +0000
4@@ -1,4 +1,11 @@
5-gnome-control-center (1:3.26.0-0ubuntu1) UNRELEASED; urgency=medium
6+gnome-control-center (1:3.26.0-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * debian/patches/connectivity-switch.patch: watch the correct property
9+ so the connectivity switch updates correctly. (LP: #1715662)
10+
11+ -- James Henstridge <james.henstridge@canonical.com> Wed, 20 Sep 2017 17:16:34 +0800
12+
13+gnome-control-center (1:3.26.0-0ubuntu1) artful; urgency=medium
14
15 * New upstream release
16 * debian/control.in:
17@@ -13,7 +20,7 @@
18 * Replace ubuntu_external_panels.patch with simpler
19 OnlyShowIn/NotShowIn patch applied upstream
20
21- -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 14 Sep 2017 09:29:26 -0400
22+ -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 14 Sep 2017 11:47:25 -0400
23
24 gnome-control-center (1:3.25.92.1-0ubuntu3) artful; urgency=medium
25
26
27=== modified file 'debian/patches/connectivity-switch.patch'
28--- debian/patches/connectivity-switch.patch 2017-08-24 02:01:12 +0000
29+++ debian/patches/connectivity-switch.patch 2017-09-20 09:24:27 +0000
30@@ -1,4 +1,4 @@
31-From e5eaabefcfd09503b3a96f82ec45645e1929b656 Mon Sep 17 00:00:00 2001
32+From 639a4e64919bbf93eff5adc428b5c3922aa9aa43 Mon Sep 17 00:00:00 2001
33 From: James Henstridge <james@jamesh.id.au>
34 Date: Wed, 9 Aug 2017 22:30:21 +0800
35 Subject: [PATCH] panels/privacy: add network connectivity checking toggle
36@@ -31,7 +31,7 @@
37 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/privacy.gresource.xml)
38 cc-privacy-resources.c: privacy.gresource.xml $(resource_files)
39 diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
40-index fb985132c..f3255859c 100644
41+index ab367b6ca..ab16a4841 100644
42 --- a/panels/privacy/cc-privacy-panel.c
43 +++ b/panels/privacy/cc-privacy-panel.c
44 @@ -18,6 +18,8 @@
45@@ -73,7 +73,7 @@
46 +#ifdef BUILD_NETWORK
47 +static void
48 +set_connectivity_check_label (NMClient *client,
49-+ GParamSpec *pspec,
50++ GParamSpec *pspec G_GNUC_UNUSED,
51 + GtkLabel *label)
52 +{
53 + gboolean enabled = nm_client_connectivity_check_get_enabled (client);
54@@ -96,7 +96,7 @@
55 +
56 +static void
57 +set_connectivity_row_visible (NMClient *client,
58-+ GParamSpec *pspec,
59++ GParamSpec *pspec G_GNUC_UNUSED,
60 + GtkWidget *row)
61 +{
62 + gboolean available = nm_client_connectivity_check_get_available (client);
63@@ -106,7 +106,7 @@
64 +
65 +static void
66 +set_connectivity_switch (NMClient *client,
67-+ GParamSpec *pspec,
68++ GParamSpec *pspec G_GNUC_UNUSED,
69 + GtkSwitch *sw)
70 +{
71 + gboolean enabled = nm_client_connectivity_check_get_enabled (client);
72@@ -115,9 +115,9 @@
73 +}
74 +
75 +static gboolean
76-+connectivity_switch_state_set (GtkSwitch *sw,
77-+ gboolean state,
78-+ NMClient *client)
79++on_connectivity_switch_state_set (GtkSwitch *sw G_GNUC_UNUSED,
80++ gboolean state,
81++ NMClient *client)
82 +{
83 + nm_client_connectivity_check_set_enabled (client, state);
84 + return TRUE;
85@@ -148,11 +148,11 @@
86 +
87 + w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "connectivity_check_switch"));
88 + g_signal_connect_object (self->priv->nm_client,
89-+ "notify::" NM_CLIENT_CONNECTIVITY_CHECK_AVAILABLE,
90++ "notify::" NM_CLIENT_CONNECTIVITY_CHECK_ENABLED,
91 + G_CALLBACK (set_connectivity_switch), w, 0);
92 + set_connectivity_switch (self->priv->nm_client, NULL, GTK_SWITCH (w));
93 + g_signal_connect_object (w, "state-set",
94-+ G_CALLBACK (connectivity_switch_state_set),
95++ G_CALLBACK (on_connectivity_switch_state_set),
96 + self->priv->nm_client, 0);
97 +}
98 +#else
99@@ -191,7 +191,7 @@
100 g_signal_connect (self->priv->lockdown_settings, "changed",
101 G_CALLBACK (on_lockdown_settings_changed), self);
102 diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
103-index e9eeb019b..46ea6010a 100644
104+index ae0471dee..f61c213a4 100644
105 --- a/panels/privacy/privacy.ui
106 +++ b/panels/privacy/privacy.ui
107 @@ -1038,4 +1038,90 @@ All the information we collect is made anonymous, and we will never share your d
108@@ -285,3 +285,6 @@
109 + </object>
110 +
111 </interface>
112+--
113+2.14.1
114+

Subscribers

People subscribed via source and target branches