Network Manager Applet

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

  1. lp445872
  2. Merge into ubuntu
Proposed by Matvey Marinin
Status: Merged
Merged at revision: 350
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
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Network-manager Pending
Review via email: mp+107051@code.qastaging.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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches