Network Manager Applet

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

lp445872
Merge into ubuntu

Proposed by Matvey Marinin on 2012-04-08

Status:	Superseded
Proposed branch:	lp://qastaging/~matvey-marinin/network-manager-applet/lp445872
Merge into:	lp://qastaging/~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://qastaging/~matvey-marinin/network-manager-applet/lp445872
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Matvey Marinin (community)		Needs Resubmitting on 2012-04-13
Mathieu Trudel-Lapierre	2012-04-08	Needs Fixing on 2012-04-11
Review via email: mp+101210@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2012-05-23.

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.

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2012-04-11:

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

lp://qastaging/~matvey-marinin/network-manager-applet/lp445872 updated on 2012-04-13

337. By Matvey Marinin on 2012-04-13: debian/patches/lp341684_device_sensitive_disconnect_notify.patch: updated
to respect gconf setting "/apps/nm-applet/disable-disconnected-notifications". (LP: #445872)

Revision history for this message

Matvey Marinin (matvey-marinin) wrote on 2012-04-13:

> 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.