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 |
Related bugs: |
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/
To post a comment you must log in.
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?