[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=55283f2

The following commit has been merged in the master branch:
commit 55283f2ce5c842f6d727616c832cb37480a1b953
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 14 14:18:48 2011 +0200

    Support multiple file transfers
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    FEATURE: 288555
---
 main-widget.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 686d629..93736c4 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -563,29 +563,31 @@ void MainWidget::startFileTransferChannel(ContactModelItem *contactItem)
 
     Tp::AccountPtr account = m_model->accountForContactItem(contactItem);
 
-    QString filename = KFileDialog::getOpenFileName(KUrl("kfiledialog:///FileTransferLastDirectory"),
+    QStringList filenames = KFileDialog::getOpenFileNames(KUrl("kfiledialog:///FileTransferLastDirectory"),
                                                     QString(),
                                                     this,
-                                                    i18n("Choose a file"));
+                                                    i18n("Choose one or more files"));
 
-    if (filename.isEmpty()) { // User hit cancel button
+    if (filenames.isEmpty()) { // User hit cancel button
         return;
     }
 
-    QFileInfo fileinfo(filename);
+    QDateTime now = QDateTime::currentDateTime();
+    Q_FOREACH(QString filename, filenames) {
+        QFileInfo fileinfo(filename);
 
-    kDebug() << "Filename:" << filename;
-    kDebug() << "Content type:" << KMimeType::findByFileContent(filename)->name();
-    // TODO Let the user set a description?
+        kDebug() << "Filename:" << filename;
+        kDebug() << "Content type:" << KMimeType::findByFileContent(filename)->name();
 
-    Tp::FileTransferChannelCreationProperties fileTransferProperties(filename,
-                                                                     KMimeType::findByFileContent(filename)->name());
+        Tp::FileTransferChannelCreationProperties fileTransferProperties(filename,
+                                                                         KMimeType::findByFileContent(filename)->name());
 
-    Tp::PendingChannelRequest* channelRequest = account->createFileTransfer(contact,
-                                                                            fileTransferProperties,
-                                                                            QDateTime::currentDateTime(),
-                                                                            PREFERRED_FILETRANSFER_HANDLER);
-    connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+        Tp::PendingChannelRequest* channelRequest = account->createFileTransfer(contact,
+                                                                                fileTransferProperties,
+                                                                                now,
+                                                                                PREFERRED_FILETRANSFER_HANDLER);
+        connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
+    }
 }
 
 void MainWidget::showMessageToUser(const QString& text, const MainWidget::SystemMessageType type)

-- 
ktp-contact-list packaging