tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix

Browse source
This commit is contained in:
Samoilenko Yuri 2014-01-18 11:42:59 +04:00
parent b1683127a6
commit 225c25197e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kded/plugins/sftp/sftpplugin.cpp
View file

@ -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()