[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:11:30 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=c34fbb7
The following commit has been merged in the master branch:
commit c34fbb734e8c9a81944cf243329f833c786d7054
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Sat Sep 3 18:43:26 2011 +0100
Use QPointer to fix code considered crashy by krazy
See http://blogs.kde.org/node/3919
---
src/handle-incoming-file-transfer-channel-job.cpp | 31 ++++++++++++-----------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index d9c81d3..5441bc9 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -20,7 +20,8 @@
#include "handle-incoming-file-transfer-channel-job.h"
#include "telepathy-base-job_p.h"
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtCore/QPointer>
#include <KLocalizedString>
#include <KDebug>
@@ -130,19 +131,19 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
QFileInfo fileInfo(url.toLocalFile());
if (fileInfo.exists()) // TODO check if it is a dir?
{
- KIO::RenameDialog renameDialog(0,
- i18n("Incoming file exists"),
- KUrl(), //TODO
- url,
- KIO::M_OVERWRITE,
- fileInfo.size(),
- channel->size(),
- fileInfo.created().toTime_t(),
- time_t(-1),
- fileInfo.lastModified().toTime_t(),
- channel->lastModificationTime().toTime_t());
- renameDialog.exec();
- switch (renameDialog.result())
+ QPointer<KIO::RenameDialog> renameDialog = new KIO::RenameDialog(0,
+ i18n("Incoming file exists"),
+ KUrl(), //TODO
+ url,
+ KIO::M_OVERWRITE,
+ fileInfo.size(),
+ channel->size(),
+ fileInfo.created().toTime_t(),
+ time_t(-1),
+ fileInfo.lastModified().toTime_t(),
+ channel->lastModificationTime().toTime_t());
+ renameDialog->exec();
+ switch (renameDialog->result())
{
case KIO::R_CANCEL:
// TODO Cancel file transfer and close channel
@@ -150,7 +151,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__start()
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
return;
case KIO::R_RENAME:
- url = renameDialog.newDestUrl();
+ url = renameDialog->newDestUrl();
break;
case KIO::R_OVERWRITE:
break;
--
ktp-filetransfer-handler packaging
More information about the pkg-kde-commits
mailing list