[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=85219ce

The following commit has been merged in the master branch:
commit 85219ce380167bfbeda039b1dc5addab263c75dd
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jun 6 21:30:22 2011 +0200

    Don't request a file transfer channel if user hit cancel
---
 main-widget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index f96964d..07e23e1 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -552,6 +552,10 @@ void MainWidget::startFileTransferChannel(ContactModelItem *contactItem)
                                                     i18n("Choose a file")
     );
 
+    if (filename.isEmpty()) { // User hit cancel button
+        return;
+    }
+
     QFileInfo fileinfo(filename);
 
     kDebug() << "Filename:" << filename;

-- 
ktp-contact-list packaging