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

[Andrea Azzarone]

Clear the clipboard when locking the screen.

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

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

== Test ==
TestLockScreenController.LockScreenClearsClipboard added.

[PS Jenkins bot (ps-jenkins)]

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)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

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

[Andrea Azzarone (azzar1)]

> 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.

[Andrea Azzarone (azzar1)]

Branch updated.

[PS Jenkins bot (ps-jenkins)]

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)

[Andrea Azzarone (azzar1)]

Branch updated!!

[Marco Trevisan (Treviño) (3v1n0)]

Cool!

review: Approve

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-04-25 21:58:08 +0000
+++ lockscreen/UserPromptView.cpp	2014-05-26 14:59:14 +0000
@@ -333,6 +333,7 @@
   text_entry->SetPasswordMode(!visible);
   text_entry->SetPasswordChar("•");
   text_entry->SetToggleCursorVisibilityOnKeyFocus(true);
+  text_entry->clipboard_enabled = false;
 
   text_entry->key_up.connect(sigc::mem_fun(this, &UserPromptView::RecvKeyUp));
 

=== modified file 'unity-shared/IMTextEntry.cpp'
--- unity-shared/IMTextEntry.cpp	2014-03-05 03:48:27 +0000
+++ unity-shared/IMTextEntry.cpp	2014-05-26 14:59:14 +0000
@@ -27,10 +27,14 @@
 
 IMTextEntry::IMTextEntry()
   : TextEntry("", NUX_TRACKER_LOCATION)
+  , clipboard_enabled(true)
 {}
 
 void IMTextEntry::CopyClipboard()
 {
+  if (!clipboard_enabled())
+    return;
+
   int start, end;
 
   if (GetSelectionBounds(&start, &end))
@@ -52,6 +56,9 @@
 
 void IMTextEntry::Paste(bool primary)
 {
+  if (!clipboard_enabled())
+    return;
+
   GdkAtom origin = primary ? GDK_SELECTION_PRIMARY : GDK_SELECTION_CLIPBOARD;
   GtkClipboard* clip = gtk_clipboard_get(origin);
 

=== modified file 'unity-shared/IMTextEntry.h'
--- unity-shared/IMTextEntry.h	2014-03-05 03:48:27 +0000
+++ unity-shared/IMTextEntry.h	2014-05-26 14:59:14 +0000
@@ -33,6 +33,8 @@
 public:
   IMTextEntry();
 
+  nux::Property<bool> clipboard_enabled;
+
   bool im_preedit();
 
 protected: