|
 |
b668ef |
From fae9b31c270adfe867365b1908dc9888fdb00fd1 Mon Sep 17 00:00:00 2001
|
|
|
b668ef |
From: David Rosca <nowrep@gmail.com>
|
|
|
b668ef |
Date: Mon, 12 Jan 2015 15:04:40 +0100
|
|
|
b668ef |
Subject: [PATCH 18/20] kio_obexftp: Fix finished() called twice in get()
|
|
|
b668ef |
|
|
|
b668ef |
This fixes eg. loading images from obexftp in gwenview
|
|
|
b668ef |
---
|
|
|
b668ef |
src/kio/obexftp/kio_obexftp.cpp | 7 +------
|
|
|
b668ef |
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
b668ef |
|
|
|
b668ef |
diff --git a/src/kio/obexftp/kio_obexftp.cpp b/src/kio/obexftp/kio_obexftp.cpp
|
|
|
b668ef |
index 0783662..82ce5cd 100644
|
|
|
b668ef |
--- a/src/kio/obexftp/kio_obexftp.cpp
|
|
|
b668ef |
+++ b/src/kio/obexftp/kio_obexftp.cpp
|
|
|
b668ef |
@@ -195,6 +195,7 @@ void KioFtp::copy(const KUrl &src, const KUrl &dest, int permissions, KIO::JobFl
|
|
|
b668ef |
kDebug() << "copy: " << src.url() << " to " << dest.url();
|
|
|
b668ef |
|
|
|
b668ef |
copyHelper(src, dest);
|
|
|
b668ef |
+ finished();
|
|
|
b668ef |
}
|
|
|
b668ef |
|
|
|
b668ef |
void KioFtp::rename(const KUrl& src, const KUrl& dest, KIO::JobFlags flags)
|
|
|
b668ef |
@@ -342,8 +343,6 @@ void KioFtp::copyWithinObexftp(const KUrl &src, const KUrl &dest)
|
|
|
b668ef |
if (!copyFile(src.path(), dest.path())) {
|
|
|
b668ef |
return;
|
|
|
b668ef |
}
|
|
|
b668ef |
-
|
|
|
b668ef |
- finished();
|
|
|
b668ef |
}
|
|
|
b668ef |
|
|
|
b668ef |
void KioFtp::copyFromObexftp(const KUrl& src, const KUrl& dest)
|
|
|
b668ef |
@@ -362,8 +361,6 @@ void KioFtp::copyFromObexftp(const KUrl& src, const KUrl& dest)
|
|
|
b668ef |
|
|
|
b668ef |
TransferFileJob *getFile = new TransferFileJob(dbusPath, this);
|
|
|
b668ef |
getFile->exec();
|
|
|
b668ef |
-
|
|
|
b668ef |
- finished();
|
|
|
b668ef |
}
|
|
|
b668ef |
|
|
|
b668ef |
void KioFtp::copyToObexftp(const KUrl& src, const KUrl& dest)
|
|
|
b668ef |
@@ -382,8 +379,6 @@ void KioFtp::copyToObexftp(const KUrl& src, const KUrl& dest)
|
|
|
b668ef |
|
|
|
b668ef |
TransferFileJob *putFile = new TransferFileJob(dbusPath, this);
|
|
|
b668ef |
putFile->exec();
|
|
|
b668ef |
-
|
|
|
b668ef |
- finished();
|
|
|
b668ef |
}
|
|
|
b668ef |
|
|
|
b668ef |
void KioFtp::statHelper(const KUrl& url)
|
|
|
b668ef |
--
|
|
|
b668ef |
2.1.0
|
|
|
b668ef |
|