[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=42ab578

The following commit has been merged in the master branch:
commit 42ab578b9a833f93b21e98de0b751fa0cb4ef008
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
Date:   Thu Apr 10 16:35:17 2014 +0200

    Enable file transfer in kpeople actions plugin
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
---
 kpeople/actionsplugin/kpeople-actions-plugin.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index 1f58ee1..837954f 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -164,13 +164,12 @@ QList<QAction*> KPeopleActionsPlugin::actionsForPerson(const KABC::Addressee &pe
     }
 
     if (contact->fileTransferCapability()) {
-        QAction *action = new IMAction(i18n("Send a File Using %1...", account->displayName()),
+        QAction *action = new IMAction(i18n("Send Files Using %1...", account->displayName()),
                                     KIcon(QLatin1String("mail-attachment")),
                                     contact,
                                     account,
                                     FileTransfer,
                                     parent);
-        action->setDisabled(true); //FIXME: we need to prompt for file
         connect (action, SIGNAL(triggered(bool)), SLOT(onActionTriggered()));
         actions << action;
     }
@@ -213,9 +212,16 @@ void KPeopleActionsPlugin::onActionTriggered()
         case VideoChannel:
             KTp::Actions::startAudioVideoCall(account, contact);
             break;
-        case FileTransfer:
-            //TODO: add filetransfer
+        case FileTransfer: {
+            const QStringList fileNames = KFileDialog::getOpenFileNames(KUrl("kfiledialog:///FileTransferLastDirectory"),
+                                                                        QString(),
+                                                                        0,
+                                                                        i18n("Choose files to send to %1", contact->alias()));
+            Q_FOREACH(const QString& file, fileNames) {
+                KTp::Actions::startFileTransfer(account, contact, file);
+            }
             break;
+        }
         case LogViewer:
             KTp::Actions::openLogViewer(action->uri());
             break;

-- 
ktp-common-internals packaging