Unity

Merge lp://qastaging/~azzar1/unity/fix-lp-1308911 into lp://qastaging/unity

  1. fix-lp-1308911
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3817
Proposed branch: lp://qastaging/~azzar1/unity/fix-lp-1308911
Merge into: lp://qastaging/unity
Diff against target: 53 lines (+10/-0)
3 files modified
lockscreen/UserPromptView.cpp (+1/-0)
unity-shared/IMTextEntry.cpp (+7/-0)
unity-shared/IMTextEntry.h (+2/-0)
To merge this branch: bzr merge lp://qastaging/~azzar1/unity/fix-lp-1308911
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+219877@code.qastaging.launchpad.net

Commit message

Clear the clipboard when locking the screen.

Description of the change

== Problem ==
Clipboard contents are accessible within lockscreen.

== Fix ==
Clear the clipboard when locking the screen.

== Test ==
TestLockScreenController.LockScreenClearsClipboard added.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3807
http://jenkins.qa.ubuntu.com/job/unity-ci/927/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/927/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Mh, I think that this would cause a regression where the clipboard is not restored once unlocked.

So imho, we should save the clipboard and restore it once unlocked (the best would be even saving the contents inside a file in the runtime dir, and restoring it from that in case of crash, but this is lower prio).

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote :

> Mh, I think that this would cause a regression where the clipboard is not
> restored once unlocked.
>
> So imho, we should save the clipboard and restore it once unlocked (the best
> would be even saving the contents inside a file in the runtime dir, and
> restoring it from that in case of crash, but this is lower prio).

Actually that's the way g-s works so we cannot consider it a regression. At this point clearing the clipboard does not make sense, we can just disable copy-paste for the text-entry.

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Branch updated.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3808
http://jenkins.qa.ubuntu.com/job/unity-ci/928/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/928/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Branch updated!!

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool!

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.