[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:20 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=eafa019
The following commit has been merged in the master branch:
commit eafa0194d5e86a11d6a1dc797e69a5d2f12c01ee
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date: Thu Jan 30 19:45:49 2014 +0400
simple bugfix
---
kded/plugins/sftp/mounter.h | 3 ++-
kded/plugins/sftp/sftpplugin.cpp | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kded/plugins/sftp/mounter.h b/kded/plugins/sftp/mounter.h
index 9c4045a..5e0d092 100644
--- a/kded/plugins/sftp/mounter.h
+++ b/kded/plugins/sftp/mounter.h
@@ -37,7 +37,8 @@ public:
virtual ~Mounter();
bool wait();
-
+ bool isMounted() const {return m_started;}
+
Q_SIGNALS:
void mounted();
void unmounted(bool idleTimeout);
diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index efa5fea..2c68364 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -127,7 +127,7 @@ bool SftpPlugin::mountAndWait()
bool SftpPlugin::isMounted()
{
- return m_d->mounter;
+ return m_d->mounter && m_d->mounter->isMounted();
}
void SftpPlugin::startBrowsing()
@@ -193,6 +193,8 @@ void SftpPlugin::onFailed(const QString& message)
, message
, KIconLoader::global()->loadIcon("dialog-error", KIconLoader::Desktop)
);
+ m_d->mounter->deleteLater();
+ m_d->mounter = 0;
}
void SftpPlugin::knotify(int type, const QString& text, const QPixmap& icon) const
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list