[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=409422a

The following commit has been merged in the master branch:
commit 409422a520600832634743722aeb01ce057e22fd
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Mar 12 11:38:54 2012 +0100

    Handle Esc key while editing the presence message
    
    This will allow to cancel the editing mode with Esc key
    
    Reviewed-by: Daniele E. Domenichelli
---
 global-presence-chooser.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 9377c37..18b0d6f 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -241,6 +241,10 @@ bool GlobalPresenceChooser::event(QEvent *e)
             onConfirmPresenceMessageClicked();
             return true;
         }
+        if (ke->key() == Qt::Key_Escape) {
+            setEditable(false);
+            m_changePresenceMessageButton->show();
+        }
     }
 
     if (e->type() == QEvent::FocusOut) {

-- 
ktp-contact-list packaging