[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=c18ee6f

The following commit has been merged in the master branch:
commit c18ee6f1d8957be3883ad96897b6b5270269ed94
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 8c39f80..60ce0dc 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();
 }
 
 bool SftpPlugin::startBrowsing()
@@ -194,6 +194,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