[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=1cfc842

The following commit has been merged in the master branch:
commit 1cfc84226ef7268b54ffcac45bb95af0b6810470
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 20 01:01:51 2013 +0000

    Make sure the input component gets the focus
    
    REVIEW: 109036
---
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml           | 2 +-
 chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index 2d13dba..7bc6279 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -24,7 +24,7 @@ import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 import org.kde.qtextracomponents 0.1 as ExtraComponents
 import org.kde.plasma.components 0.1 as PlasmaComponents
 
-Item {
+FocusScope {
     id: chatWidget
     property Conversation conv
     property alias pinned: pinButton.checked
diff --git a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
index e17e925..fc5592a 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ConversationDelegate.qml
@@ -71,9 +71,10 @@ ConversationDelegateButton {
 
                 dialog.x = point.x;
                 dialog.y = point.y;
-                dialog.activateWindow()
+                dialog.activateWindow();
+                dialog.mainItem.focus = true;
             } else if(base.currentIndex != -1) {
-                closeConversation()
+                closeConversation();
             }
         }
     }

-- 
ktp-contact-applet packaging