[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=0410729

The following commit has been merged in the master branch:
commit 04107291363119224ce3925b9a0fc7aa72f59868
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Feb 14 17:12:15 2014 +0100

    Fixing problem with sshfs asking to add host to the "known hosts" file
---
 kded/plugins/sftp/mounter.cpp      | 13 ++++++++-----
 kded/plugins/sftp/sftpplugin.cpp   |  5 +++--
 kded/plugins/share/shareplugin.cpp |  1 -
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/kded/plugins/sftp/mounter.cpp b/kded/plugins/sftp/mounter.cpp
index 5a9705e..dae3c57 100644
--- a/kded/plugins/sftp/mounter.cpp
+++ b/kded/plugins/sftp/mounter.cpp
@@ -18,7 +18,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <QDir>
 #include <QTimerEvent>
 
@@ -102,7 +101,7 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
     connect(m_proc.data(), SIGNAL(started()), SLOT(onStarted()));    
     connect(m_proc.data(), SIGNAL(error(QProcess::ProcessError)), SLOT(onError(QProcess::ProcessError)));
     connect(m_proc.data(), SIGNAL(finished(int,QProcess::ExitStatus)), SLOT(onFinished(int,QProcess::ExitStatus)));
-    
+
     const QString mpoint = m_sftp->mountPoint();
     QDir().mkpath(mpoint);
     
@@ -116,12 +115,16 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
         << "-p" << np.get<QString>("port")
         << "-d"
         << "-f"
-        << "-o IdentityFile=" + m_sftp->device()->privateKeyPath()
-        << "-o StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host
-        << "-o UserKnownHostsFile=/dev/null"; //Prevent storing as a known host
+        << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath()
+        << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host
+        << "-o" << "UserKnownHostsFile=/dev/null"; //Prevent storing as a known host
     
     m_proc->setProgram(program, arguments);
 
+    //To debug
+    //m_proc->setStandardOutputFile("/tmp/kdeconnect-sftp.out");
+    //m_proc->setStandardErrorFile("/tmp/kdeconnect-sftp.err");
+
     cleanMountPoint();
     
     kDebug(kdeconnect_kded()) << "Staring process: " << m_proc->program().join(" ");
diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index d284114..32c6168 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -21,6 +21,7 @@
 #include "sftpplugin.h"
 
 #include <QDBusConnection>
+#include <QDir>
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -29,8 +30,8 @@
 #include <KNotification>
 #include <KRun>
 #include <KStandardDirs>
+#include <KFilePlacesModel>
 #include <kde_file.h>
-#include <kfileplacesmodel.h>
 
 #include "sftp_config.h"
 #include "mounter.h"
@@ -156,7 +157,7 @@ QString SftpPlugin::mountPoint()
 {
     const QString defaultMountDir = KStandardDirs::locateLocal("appdata", "", true, componentData());
     const QString mountDir = KConfig("kdeconnect/plugins/sftp").group("main").readEntry("mountpoint", defaultMountDir);
-    return mountDir + "/" + device()->id() + "/";
+    return QDir(mountDir).absoluteFilePath(device()->id());
 }
 
 void SftpPlugin::onMounted()
diff --git a/kded/plugins/share/shareplugin.cpp b/kded/plugins/share/shareplugin.cpp
index 5579a30..306a228 100644
--- a/kded/plugins/share/shareplugin.cpp
+++ b/kded/plugins/share/shareplugin.cpp
@@ -27,7 +27,6 @@
 #include <KSharedConfig>
 #include <KConfigGroup>
 
-#include <QFile>
 #include <qprocess.h>
 #include <QDir>
 #include <QDesktopServices>

-- 
kdeconnect packaging