[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8c4ef1d

The following commit has been merged in the master branch:
commit 8c4ef1da74e8b6f8946694dd9b88c0e5784d31b5
Author: Leon Handreke <leonh at ndreke.de>
Date:   Mon Apr 14 19:04:42 2014 +0200

    Allow inviting multiple people at once into a group chat
    
    REVIEW: 117567
---
 app/invite-contact-dialog.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/invite-contact-dialog.cpp b/app/invite-contact-dialog.cpp
index 4d11d92..c24a288 100644
--- a/app/invite-contact-dialog.cpp
+++ b/app/invite-contact-dialog.cpp
@@ -22,6 +22,8 @@
 
 #include "invite-contact-dialog.h"
 
+#include <QtCore/QPointer>
+
 #include <KDE/KLineEdit>
 #include <KDE/KPushButton>
 #include <KDE/KLocalizedString>
@@ -50,6 +52,8 @@ InviteContactDialog::InviteContactDialog(const Tp::AccountManagerPtr &accountMan
     m_contactGridWidget->contactFilterLineEdit()->setClickMessage(i18n("Search in Contacts..."));
     m_contactGridWidget->filter()->setPresenceTypeFilterFlags(KTp::ContactsFilterModel::ShowOnlyConnected);
     m_contactGridWidget->filter()->setAccountFilter(account);
+    m_contactGridWidget->setSelectionMode(QAbstractItemView::MultiSelection);
+
     setMainWidget(m_contactGridWidget);
     setWindowTitle(i18n("Select Contacts to Invite to Group Chat"));
 
@@ -80,19 +84,19 @@ void InviteContactDialog::onOkClicked()
         return;
     }
 
-    Tp::ContactPtr contact = m_contactGridWidget->selectedContact();
+    QList<Tp::ContactPtr> contacts;
+    Q_FOREACH (const KTp::ContactPtr &contact, m_contactGridWidget->selectedContacts()) {
+        contacts << contact;
+    }
 
-    if (contact.isNull() || m_channel.isNull() || m_account.isNull()) {
+    if (contacts.isEmpty() || m_channel.isNull() || m_account.isNull()) {
         return;
     }
 
     //if can invite do so, otherwise make a new channel with the new contacts
     if (m_channel->canInviteContacts()) {
-        m_channel->inviteContacts(QList<Tp::ContactPtr>() << contact);
-    }
-    else {
-        QList<Tp::ContactPtr> contacts;
-        contacts << contact;
+        m_channel->inviteContacts(contacts);
+    } else {
         m_account->createConferenceTextChat(QList<Tp::ChannelPtr>() << m_channel, contacts);
     }
 }

-- 
ktp-text-ui packaging