Merge lp://staging/~jmacmahon/wicd/wired-enc into lp://staging/wicd/1.6
Proposed by
Joe MacMahon
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 716 | ||||
Proposed branch: | lp://staging/~jmacmahon/wicd/wired-enc | ||||
Merge into: | lp://staging/wicd/1.6 | ||||
Diff against target: |
631 lines (+289/-110) 9 files modified
curses/netentry_curses.py (+114/-47) curses/wicd-curses.py (+1/-1) encryption/templates/active_wired (+1/-0) encryption/templates/wired_8021x (+17/-0) gtk/netentry.py (+110/-42) wicd/misc.py (+15/-5) wicd/networking.py (+15/-7) wicd/wicd-daemon.py (+2/-1) wicd/wnettools.py (+14/-7) |
||||
To merge this branch: | bzr merge lp://staging/~jmacmahon/wicd/wired-enc | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Paleino | Approve | ||
Review via email:
|
Description of the change
Wired encryption templates have been implemented in the daemon, GTK interface and ncurses interface.
Included is an encryption template for 802.1x wired networks.
Encryption settings may be saved to and loaded from wired profiles.
To post a comment you must log in.
Oh, thanks.
I don't have any kind of such setup handy, so I can't really test it. I'm confident you did, though :)
I'll review the code ASAP.
Thanks for your contribution,
David