lp:~mterry/ubuntu-system-settings/avoid-agent-race

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-system-settings at revision 969

Ken VanDine: Approve on 2014-08-29

PS Jenkins bot: Approve (continuous-integration) on 2014-08-28

Diff: 225 lines (+71/-24)

5 files modified

plugins/security-privacy/LockSecurity.qml (+5/-1)
plugins/security-privacy/helper.cpp (+9/-3)
plugins/security-privacy/polkitlistener.cpp (+3/-1)
plugins/security-privacy/securityprivacy.cpp (+51/-18)
plugins/security-privacy/securityprivacy.h (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1350381: User shouldn't be prompted for password to switch to swipe if it's not needed	Medium	Fix Released
Bug #1361137: Resetting PIN/passcode/password lock doesn't work	Critical	Fix Released

Link a bug report

Related blueprints

953. By Michael Terry on 2014-08-28

Merge from trunk

952. By Michael Terry on 2014-08-28

Avoid race condition with unregistering our policykit agent

951. By PS Jenkins bot on 2014-08-27

Releasing 0.3+14.10.20140827.1-0ubuntu1

950. By Mathieu Trudel-Lapierre on 2014-08-27

Fix PIN code or passcode requests by properly matching the tag for the original request. Fixes: 1355152
Approved by: Sebastien Bacher, PS Jenkins bot

949. By Launchpad Translations on behalf of system-settings-touch on 2014-08-27

Launchpad automatic translations update.

948. By PS Jenkins bot on 2014-08-26

Releasing 0.3+14.10.20140826.1-0ubuntu1

947. By Jonas G. Drange on 2014-08-26

[main panel] show rotation lock, point to correct setting
Approved by: Sebastien Bacher, PS Jenkins bot

946. By Sebastien Bacher on 2014-08-26

Include extra files for translations Fixes: 1359267
Approved by: Ken VanDine

945. By Martin Pitt on 2014-08-26

Update PO template

944. By Launchpad Translations on behalf of system-settings-touch on 2014-08-26

Launchpad automatic translations update.