[kde-workspace/f18] Clear lockerscreen password field on ESC

[Daniel Vrátil]

commit e2e6f5f56dcfe18fa56eb098ecd67306b508b7eb
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Apr 15 18:21:58 2013 +0200

    Clear lockerscreen password field on ESC
    
    Resolves: 949452

 ...4.10.2-clear-screenlocker-password-on-esc.patch |   80 ++++++++++++++++++++
 kde-workspace.spec                                 |    9 ++-
 2 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/kde-workspace-4.10.2-clear-screenlocker-password-on-esc.patch b/kde-workspace-4.10.2-clear-screenlocker-password-on-esc.patch
new file mode 100644
index 0000000..0c20c4c
--- /dev/null
+++ b/kde-workspace-4.10.2-clear-screenlocker-password-on-esc.patch
@@ -0,0 +1,80 @@
+commit 06d67a3a0ca6c5e9ea545b40d04a300f316b9405
+Author: Dan Vrátil <dvratil at redhat.com>
+Date:   Thu Apr 11 13:27:34 2013 +0200
+
+    Clear screenlocker password field on ESC key
+    
+    REVIEW: 109945
+
+diff --git a/ksmserver/screenlocker/greeter/greeter.cpp b/ksmserver/screenlocker/greeter/greeter.cpp
+index f5918f9..4ba67f8 100644
+--- a/ksmserver/screenlocker/greeter/greeter.cpp
++++ b/ksmserver/screenlocker/greeter/greeter.cpp
+@@ -114,6 +114,11 @@ void GreeterItem::verify()
+     m_unlocker->verify();
+ }
+ 
++void GreeterItem::clear()
++{
++    m_unlocker->clear();
++}
++
+ void GreeterItem::focusInEvent(QFocusEvent *event)
+ {
+     QGraphicsItem::focusInEvent(event);
+@@ -275,6 +280,11 @@ void Greeter::verify()
+     m_greet->next();
+ }
+ 
++void Greeter::clear()
++{
++    m_greet->clear();
++}
++
+ void Greeter::failedTimer()
+ {
+     emit greeterReady();
+diff --git a/ksmserver/screenlocker/greeter/greeter.h b/ksmserver/screenlocker/greeter/greeter.h
+index a0a1ac3..e50a40c 100644
+--- a/ksmserver/screenlocker/greeter/greeter.h
++++ b/ksmserver/screenlocker/greeter/greeter.h
+@@ -49,6 +49,7 @@ public:
+ 
+ public Q_SLOTS:
+     void verify();
++    void clear();
+ 
+ private Q_SLOTS:
+     void themeChanged();
+@@ -60,6 +61,7 @@ Q_SIGNALS:
+     void greeterAccepted();
+ protected:
+     virtual void focusInEvent(QFocusEvent *event);
++
+ private:
+     void init();
+     QGraphicsProxyWidget *m_proxy;
+@@ -142,6 +144,11 @@ public Q_SLOTS:
+      **/
+     void verify();
+ 
++    /**
++     * Invoke to clear password field
++     */
++    void clear();
++
+ private Q_SLOTS:
+     void handleVerify();
+     void failedTimer();
+diff --git a/ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/Greeter.qml b/ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/Greeter.qml
+index 3dd9fc0..66a3bb4 100644
+--- a/ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/Greeter.qml
++++ b/ksmserver/screenlocker/greeter/themes/org.kde.passworddialog/contents/ui/Greeter.qml
+@@ -91,6 +91,7 @@ Item {
+ 
+                 Keys.onEnterPressed: verify()
+                 Keys.onReturnPressed: verify()
++                Keys.onEscapePressed: clear()
+             }
+             KeyboardItem {
+                 anchors {
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 0ed5e40..22b7129 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -16,7 +16,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -105,6 +105,7 @@ Patch62: kde-workspace-4.9.3-systemd-displaymanager.patch
 
 ## upstream patches
 Patch103: 0003-Allow-Rich-Text-in-QML-notifications-plasmoid-Allow-.patch
+Patch104: kde-workspace-4.10.2-clear-screenlocker-password-on-esc.patch
 
 ## plasma active patches
 
@@ -451,7 +452,8 @@ Requires: akonadi
 %patch62 -p0 -b .systemd-displaymanager
 
 # upstream patches
-%patch103 -p1  -b .0003
+%patch103 -p1 -b .0003
+%patch104 -p1 -b .screenlocker-esc
 
 # plasma-active
 
@@ -997,6 +999,9 @@ fi
 
 
 %changelog
+* Mon Apr 15 2013 Daniel Vrátil <dvratil at redhat.com> 4.10.2-2
+- clear lockerscreen password field on ESC key (#949452)
+
 * Sun Mar 31 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.2-1
 - 4.10.2