Merge lp:~matvey-marinin/network-manager-applet/lp445872 into lp:~network-manager/network-manager-applet/ubuntu

Proposed by Matvey Marinin
Status: Merged
Merged at revision: 350
Proposed branch: lp:~matvey-marinin/network-manager-applet/lp445872
Merge into: lp:~network-manager/network-manager-applet/ubuntu
Diff against target: 123 lines (+33/-16)
2 files modified
debian/changelog (+7/-0)
debian/patches/lp341684_device_sensitive_disconnect_notify.patch (+26/-16)
To merge this branch: bzr merge lp:~matvey-marinin/network-manager-applet/lp445872
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Network-manager Pending
Review via email: mp+107051@code.launchpad.net

This proposal supersedes a proposal from 2012-04-08.

Description of the change

Fixed bug LP445872 - debian/patches/lp341684_device_sensitive_disconnect_notify.patch updated to respect gconf setting "/apps/nm-applet/disable-disconnected-notifications". Disconnect notification has now "Don't show this message again" button. Also related to LP883443. Successfully tested on my laptop. Patch updated to current revision 337 of ~network-manager/network-manager-applet/ubuntu branch. applet_do_notify_with_pref() function doesn't have "urgency" parameter, so I used applet_do_notify().

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote : Posted in a previous version of this proposal

It seems to me like instead of doing those checks you should simply use applet_do_notify_with_pref().

Also, that change has lots of conflicts, possibly because there were changes on the branch since. Could you please clean it up and make sure you use a new changelog entry?

review: Needs Fixing
Revision history for this message
Matvey Marinin (matvey-marinin) wrote : Posted in a previous version of this proposal

> It seems to me like instead of doing those checks you should simply use
> applet_do_notify_with_pref().
>
> Also, that change has lots of conflicts, possibly because there were changes
> on the branch since. Could you please clean it up and make sure you use a new
> changelog entry?
applet_do_notify_with_pref() doesn't have urgency parameter, so I use applet_do_notify(). Patch updated to current revision 337.

review: Needs Resubmitting
Revision history for this message
James M. Leddy (jm-leddy) wrote :

Hi Mathieu, does Matvey's justification make sense?

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Yes, it's fine; I'm sponsoring this into Quantal shortly :)

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-04-05 19:07:45 +0000
3+++ debian/changelog 2012-05-23 15:40:25 +0000
4@@ -1,3 +1,10 @@
5+network-manager-applet (0.9.4.1-0ubuntu3) oneiric; urgency=low
6+
7+ * debian/patches/lp341684_device_sensitive_disconnect_notify.patch: updated
8+ to respect gconf setting "/apps/nm-applet/disable-disconnected-notifications". (LP: #445872)
9+
10+ -- Matvey Marinin <matvey.marinin@gmail.com> Fri, 13 Apr 2012 22:42:29 +0400
11+
12 network-manager-applet (0.9.4.1-0ubuntu2) precise; urgency=low
13
14 * debian/patches/nm-applet-use-indicator.patch: move the tooltip/accessible
15
16=== modified file 'debian/patches/lp341684_device_sensitive_disconnect_notify.patch'
17--- debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2012-03-29 16:12:17 +0000
18+++ debian/patches/lp341684_device_sensitive_disconnect_notify.patch 2012-05-23 15:40:25 +0000
19@@ -1,3 +1,6 @@
20+## Description: add some description
21+## Origin/Author: add some origin or author
22+## Bug: bug URL
23 === modified file 'src/applet-device-wifi.c'
24 ---
25 src/applet-device-wifi.c | 1
26@@ -5,11 +8,11 @@
27 src/applet.h | 3 +
28 3 files changed, 135 insertions(+), 4 deletions(-)
29
30-Index: b/src/applet-device-wifi.c
31+Index: lp445872_0.9.4.1/src/applet-device-wifi.c
32 ===================================================================
33---- a/src/applet-device-wifi.c
34-+++ b/src/applet-device-wifi.c
35-@@ -1263,6 +1263,7 @@ wireless_device_state_changed (NMDevice
36+--- lp445872_0.9.4.1.orig/src/applet-device-wifi.c 2012-04-13 22:39:08.524678297 +0400
37++++ lp445872_0.9.4.1/src/applet-device-wifi.c 2012-04-13 22:39:08.588678297 +0400
38+@@ -1263,6 +1263,7 @@
39 return;
40
41 esc_ssid = get_ssid_utf8 (new);
42@@ -17,10 +20,10 @@
43 applet_do_notify_with_pref (applet,
44 esc_ssid ? esc_ssid : _("(none)"),
45 _("Connection Established"),
46-Index: b/src/applet.c
47+Index: lp445872_0.9.4.1/src/applet.c
48 ===================================================================
49---- a/src/applet.c
50-+++ b/src/applet.c
51+--- lp445872_0.9.4.1.orig/src/applet.c 2012-04-13 22:39:08.420678301 +0400
52++++ lp445872_0.9.4.1/src/applet.c 2012-04-13 22:42:18.112669843 +0400
53 @@ -45,6 +45,7 @@
54 #include <dbus/dbus-glib-lowlevel.h>
55
56@@ -29,7 +32,7 @@
57 #include <nm-device-ethernet.h>
58 #include <nm-device-wifi.h>
59 #include <nm-device-modem.h>
60-@@ -210,6 +211,19 @@ impl_dbus_connect_to_3g_network (NMApple
61+@@ -210,6 +211,19 @@
62
63 /********************************************************************/
64
65@@ -49,7 +52,7 @@
66 static NMActiveConnection *
67 applet_get_best_activating_connection (NMApplet *applet, NMDevice **device)
68 {
69-@@ -2227,6 +2241,58 @@ applet_get_exported_connection_for_devic
70+@@ -2227,6 +2241,65 @@
71 return NULL;
72 }
73
74@@ -93,7 +96,14 @@
75 + NMApplet *applet = NM_APPLET (user_data);
76 + OfflineNotificationContextInfo *info = applet->notification_queue_data;
77 + if(select_merged_notification_text (info))
78-+ applet_do_notify (applet, info->urgency, info->title, info->text, info->icon, NULL, NULL, NULL, applet);
79++ if (!gconf_client_get_bool (applet->gconf_client, PREF_DISABLE_DISCONNECTED_NOTIFICATIONS, NULL))
80++ {
81++ applet_do_notify (applet, info->urgency, info->title, info->text, info->icon,
82++ PREF_DISABLE_DISCONNECTED_NOTIFICATIONS,
83++ _("Don't show this message again"),
84++ notify_dont_show_cb,
85++ applet);
86++ }
87 + else
88 + g_debug("no notification because merged found that we have nothing to say (e.g. not offline)");
89 + if (info->title)
90@@ -108,7 +118,7 @@
91 static void
92 applet_common_device_state_changed (NMDevice *device,
93 NMDeviceState new_state,
94-@@ -2240,6 +2306,54 @@ applet_common_device_state_changed (NMDe
95+@@ -2240,6 +2313,54 @@
96 vpn_activating = applet_is_any_vpn_activating (applet);
97
98 switch (new_state) {
99@@ -163,7 +173,7 @@
100 case NM_DEVICE_STATE_PREPARE:
101 case NM_DEVICE_STATE_CONFIG:
102 case NM_DEVICE_STATE_NEED_AUTH:
103-@@ -2310,13 +2424,26 @@ foo_client_state_changed_cb (NMClient *c
104+@@ -2310,13 +2431,26 @@
105 {
106 NMApplet *applet = NM_APPLET (user_data);
107
108@@ -194,11 +204,11 @@
109 default:
110 break;
111 }
112-Index: b/src/applet.h
113+Index: lp445872_0.9.4.1/src/applet.h
114 ===================================================================
115---- a/src/applet.h
116-+++ b/src/applet.h
117-@@ -175,6 +175,9 @@ typedef struct
118+--- lp445872_0.9.4.1.orig/src/applet.h 2012-03-24 02:59:57.000000000 +0400
119++++ lp445872_0.9.4.1/src/applet.h 2012-04-13 22:39:08.592678294 +0400
120+@@ -175,6 +175,9 @@
121
122 /* Tracker objects for secrets requests */
123 GSList * secrets_reqs;

Subscribers

People subscribed via source and target branches