[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=225c251

The following commit has been merged in the master branch:
commit 225c25197e008dead2f9786e369b30e094ca6824
Author: Samoilenko Yuri <kinnalru at gmail.com>
Date:   Sat Jan 18 11:42:59 2014 +0400

    bugfix
---
 kded/plugins/sftp/sftpplugin.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index 2598777..62bc09e 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -41,12 +41,13 @@
 K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SftpPlugin >(); )
 K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect_sftp") )
 
-static const char* passwd_c = "sftppassword";
 static const char* timestamp_c = "timestamp";
 static const QSet<QString> fields_c = QSet<QString>() << "ip" << "port" << "user" << "port" << "path";
 
 inline bool isTimeout(QObject* o, const KConfigGroup& cfg)
 {
+    if (!o) return false;
+    
     int duration = o->property(timestamp_c).toDateTime().secsTo(QDateTime::currentDateTime());  
     return cfg.readEntry("idle", true) && duration > (cfg.readEntry("idletimeout", 60) * 60);
 }
@@ -182,9 +183,6 @@ bool SftpPlugin::receivePackage(const NetworkPackage& np)
     connect(m_d->mountProc, SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(onFinished(int,QProcess::ExitStatus)));
     connect(m_d->mountProc, SIGNAL(finished(int,QProcess::ExitStatus)), m_d->mountProc, SLOT(deleteLater()));
     
-    connect(m_d->mountProc, SIGNAL(readyReadStandardError()), this, SLOT(readProcessStderr()));
-    connect(m_d->mountProc, SIGNAL(readyReadStandardOutput()), this, SLOT(readProcessStdout()));
-    
     const QString mpoint = mountPoint();
     QDir().mkpath(mpoint);
     
@@ -239,6 +237,9 @@ void SftpPlugin::onStarted()
         , KIconLoader::global()->loadIcon("drive-removable-media", KIconLoader::Desktop)
     );
     
+    connect(m_d->mountProc, SIGNAL(readyReadStandardError()), this, SLOT(readProcessStderr()));
+    connect(m_d->mountProc, SIGNAL(readyReadStandardOutput()), this, SLOT(readProcessStdout()));
+    
     if (m_d->waitForMount)
     {
         m_d->waitForMount = false;
@@ -317,7 +318,8 @@ void SftpPlugin::mountTimeout()
 
 void SftpPlugin::readProcessStderr()
 {
-    kError(kdeconnect_kded()) << "sshfs:" << m_d->mountProc->readAllStandardError();
+    m_d->mountProc->setProperty(timestamp_c, QDateTime::currentDateTime());    
+    m_d->mountProc->readAllStandardError();
 }
 
 void SftpPlugin::readProcessStdout()

-- 
kdeconnect packaging