Merge lp:~ted/indicator-network/modal-password into lp:indicator-network/13.10
Proposed by
Ted Gould
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Charles Kerr | ||||
Approved revision: | 317 | ||||
Merged at revision: | 309 | ||||
Proposed branch: | lp:~ted/indicator-network/modal-password | ||||
Merge into: | lp:indicator-network/13.10 | ||||
Diff against target: |
306 lines (+83/-46) 7 files modified
secret-agent/CMakeLists.txt (+1/-1) secret-agent/PasswordMenu.cpp (+29/-12) secret-agent/PasswordMenu.h (+1/-1) secret-agent/SecretAgent.cpp (+24/-12) secret-agent/SecretAgent.h (+2/-5) secret-agent/SecretRequest.cpp (+23/-6) secret-agent/SecretRequest.h (+3/-9) |
||||
To merge this branch: | bzr merge lp:~ted/indicator-network/modal-password | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pete Woods (community) | Needs Fixing | ||
Charles Kerr (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+191285@code.launchpad.net |
Commit message
Make it so we have a single notification in flight at a time.
Description of the change
We were maintaining a list of notifications to be shown, this merge changes it so that we only have one and it handles all the close notifications, along with closing itself if disposed.
To post a comment you must log in.
PASSED: Continuous integration, rev:314 jenkins. qa.ubuntu. com/job/ indicator- network- ci/88/ jenkins. qa.ubuntu. com/job/ indicator- network- saucy-amd64- ci/78 jenkins. qa.ubuntu. com/job/ indicator- network- saucy-armhf- ci/78 jenkins. qa.ubuntu. com/job/ indicator- network- saucy-armhf- ci/78/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/indicator- network- ci/88/rebuild
http://