summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2014-05-26 08:48:03 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2014-05-26 08:48:03 +0200
commit6b09bcd3d9e8169305665a9f3f2f5f1f0438f1e9 (patch)
treef207549d9d98e449f6b5dd4fc834f1580ffe8c81 /unity-shared
parent837affc668bcff2d38c8feeee19a16c49df42d9d (diff)
Disable clibpoard during lockscreen.
Fixes LP: #1312107 (bzr r3806.2.1)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/IMTextEntry.cpp7
-rw-r--r--unity-shared/IMTextEntry.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/unity-shared/IMTextEntry.cpp b/unity-shared/IMTextEntry.cpp
index 0e4e383f3..45241237d 100644
--- a/unity-shared/IMTextEntry.cpp
+++ b/unity-shared/IMTextEntry.cpp
@@ -27,10 +27,14 @@ NUX_IMPLEMENT_OBJECT_TYPE(IMTextEntry);
IMTextEntry::IMTextEntry()
: TextEntry("", NUX_TRACKER_LOCATION)
+ , clipboard_enabled(false)
{}
void IMTextEntry::CopyClipboard()
{
+ if (!clipboard_enabled())
+ return;
+
int start, end;
if (GetSelectionBounds(&start, &end))
@@ -52,6 +56,9 @@ void IMTextEntry::PastePrimaryClipboard()
void IMTextEntry::Paste(bool primary)
{
+ if (!clipboard_enabled())
+ return;
+
GdkAtom origin = primary ? GDK_SELECTION_PRIMARY : GDK_SELECTION_CLIPBOARD;
GtkClipboard* clip = gtk_clipboard_get(origin);
diff --git a/unity-shared/IMTextEntry.h b/unity-shared/IMTextEntry.h
index 194077e90..f3fb15f21 100644
--- a/unity-shared/IMTextEntry.h
+++ b/unity-shared/IMTextEntry.h
@@ -33,6 +33,8 @@ class IMTextEntry : public nux::TextEntry
public:
IMTextEntry();
+ nux::Property<bool> clipboard_enabled;
+
bool im_preedit();
protected: