Merge lp:~jm-leddy/network-manager-applet/enable-disable-disconnect-notification into lp:~network-manager/network-manager-applet/ubuntu.precise

Proposed by James M. Leddy on 2012-11-29
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2013-04-15
Approved revision: 339
Merged at revision: 340
Proposed branch: lp:~jm-leddy/network-manager-applet/enable-disable-disconnect-notification
Merge into: lp:~network-manager/network-manager-applet/ubuntu.precise
Diff against target: 98 lines (+23/-9)
2 files modified
debian/changelog (+8/-0)
debian/patches/lp341684_device_sensitive_disconnect_notify.patch (+15/-9)
To merge this branch: bzr merge lp:~jm-leddy/network-manager-applet/enable-disable-disconnect-notification
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2012-11-29 Approve on 2012-11-29
Review via email: mp+137044@code.launchpad.net
To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good, approve.

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 2012-11-23 21:48:30 +0000
3+++ debian/changelog 2012-11-29 20:52:43 +0000
4@@ -1,3 +1,11 @@
5+network-manager-applet (0.9.4.1-0ubuntu2.2) UNRELEASED; urgency=low
6+
7+ [Matvey Marinin]
8+ * debian/patches/lp341684_device_sensitive_disconnect_notify.patch: updated
9+ to respect the "disable-disconnected-notifications" settings. (LP: #445872)
10+
11+ -- James M Leddy <james.leddy@canonical.com> Mon, 26 Nov 2012 17:20:19 -0500
12+
13 network-manager-applet (0.9.4.1-0ubuntu2.1) precise-proposed; urgency=low
14
15 * Backport r355, r364, r368 from trunk (LP: #780602)
16
17=== modified file 'debian/patches/lp341684_device_sensitive_disconnect_notify.patch'
18--- debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2012-03-29 16:12:17 +0000
19+++ debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2012-11-29 20:52:43 +0000
20@@ -1,15 +1,15 @@
21 === modified file 'src/applet-device-wifi.c'
22 ---
23 src/applet-device-wifi.c | 1
24- src/applet.c | 135 +++++++++++++++++++++++++++++++++++++++++++++--
25+ src/applet.c | 141 +++++++++++++++++++++++++++++++++++++++++++++--
26 src/applet.h | 3 +
27- 3 files changed, 135 insertions(+), 4 deletions(-)
28+ 3 files changed, 141 insertions(+), 4 deletions(-)
29
30 Index: b/src/applet-device-wifi.c
31 ===================================================================
32 --- a/src/applet-device-wifi.c
33 +++ b/src/applet-device-wifi.c
34-@@ -1263,6 +1263,7 @@ wireless_device_state_changed (NMDevice
35+@@ -1259,6 +1259,7 @@ wireless_device_state_changed (NMDevice
36 return;
37
38 esc_ssid = get_ssid_utf8 (new);
39@@ -29,7 +29,7 @@
40 #include <nm-device-ethernet.h>
41 #include <nm-device-wifi.h>
42 #include <nm-device-modem.h>
43-@@ -210,6 +211,19 @@ impl_dbus_connect_to_3g_network (NMApple
44+@@ -209,6 +210,19 @@ impl_dbus_connect_to_3g_network (NMApple
45
46 /********************************************************************/
47
48@@ -49,7 +49,7 @@
49 static NMActiveConnection *
50 applet_get_best_activating_connection (NMApplet *applet, NMDevice **device)
51 {
52-@@ -2227,6 +2241,58 @@ applet_get_exported_connection_for_devic
53+@@ -2222,6 +2236,64 @@ applet_get_exported_connection_for_devic
54 return NULL;
55 }
56
57@@ -93,7 +93,13 @@
58 + NMApplet *applet = NM_APPLET (user_data);
59 + OfflineNotificationContextInfo *info = applet->notification_queue_data;
60 + if(select_merged_notification_text (info))
61-+ applet_do_notify (applet, info->urgency, info->title, info->text, info->icon, NULL, NULL, NULL, applet);
62++ if (!gconf_client_get_bool (applet->gconf_client, PREF_DISABLE_DISCONNECTED_NOTIFICATIONS, NULL))
63++ applet_do_notify (applet, info->urgency, info->title,
64++ info->text, info->icon,
65++ PREF_DISABLE_DISCONNECTED_NOTIFICATIONS,
66++ _("Don't show this message again"),
67++ notify_dont_show_cb,
68++ applet);
69 + else
70 + g_debug("no notification because merged found that we have nothing to say (e.g. not offline)");
71 + if (info->title)
72@@ -108,7 +114,7 @@
73 static void
74 applet_common_device_state_changed (NMDevice *device,
75 NMDeviceState new_state,
76-@@ -2240,6 +2306,54 @@ applet_common_device_state_changed (NMDe
77+@@ -2235,6 +2307,54 @@ applet_common_device_state_changed (NMDe
78 vpn_activating = applet_is_any_vpn_activating (applet);
79
80 switch (new_state) {
81@@ -163,7 +169,7 @@
82 case NM_DEVICE_STATE_PREPARE:
83 case NM_DEVICE_STATE_CONFIG:
84 case NM_DEVICE_STATE_NEED_AUTH:
85-@@ -2310,13 +2424,26 @@ foo_client_state_changed_cb (NMClient *c
86+@@ -2305,13 +2425,26 @@ foo_client_state_changed_cb (NMClient *c
87 {
88 NMApplet *applet = NM_APPLET (user_data);
89
90@@ -198,7 +204,7 @@
91 ===================================================================
92 --- a/src/applet.h
93 +++ b/src/applet.h
94-@@ -175,6 +175,9 @@ typedef struct
95+@@ -174,6 +174,9 @@ typedef struct
96
97 /* Tracker objects for secrets requests */
98 GSList * secrets_reqs;

Subscribers

People subscribed via source and target branches