[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=4ab2aac

The following commit has been merged in the master branch:
commit 4ab2aac466db8fcfd82eca5208cdcf045cb0c97c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Mar 12 15:39:08 2012 +0100

    Don't crash when pressing enter on the presence chooser
    
    Reviewed-by: Daniele E. Domenichelli
    BUG: 295826
---
 global-presence-chooser.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index 6803f28..668f17e 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -238,8 +238,10 @@ bool GlobalPresenceChooser::event(QEvent *e)
         QKeyEvent *ke = static_cast<QKeyEvent*>(e);
 
         if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
-            onConfirmPresenceMessageClicked();
-            return true;
+            if (isEditable()) {
+                onConfirmPresenceMessageClicked();
+                return true;
+            }
         }
         if (ke->key() == Qt::Key_Escape) {
             setEditable(false);

-- 
ktp-contact-list packaging