[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=245ee18

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

    Fixed "unknown host" problem in sftp plugin
---
 kded/plugins/sftp/mounter.cpp                              | 6 ++++--
 kded/plugins/sftp/sftp_config.ui                           | 7 -------
 kded/plugins/sftp/sftpplugin.cpp                           | 3 ++-
 plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp | 1 -
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/kded/plugins/sftp/mounter.cpp b/kded/plugins/sftp/mounter.cpp
index 6d2e16f..9714d49 100644
--- a/kded/plugins/sftp/mounter.cpp
+++ b/kded/plugins/sftp/mounter.cpp
@@ -93,7 +93,7 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
         return;
     }
     
-    //TODO implement on amdroid side
+    //TODO implement on android side
     //if (np.get<int>("id") != m_id) return;
   
     m_proc.reset(new KProcess(this));
@@ -116,7 +116,9 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
         << "-p" << np.get<QString>("port")
         << "-d"
         << "-f"
-        << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath();
+        << "-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);
 
diff --git a/kded/plugins/sftp/sftp_config.ui b/kded/plugins/sftp/sftp_config.ui
index 9b01fb7..8f66698 100644
--- a/kded/plugins/sftp/sftp_config.ui
+++ b/kded/plugins/sftp/sftp_config.ui
@@ -186,13 +186,6 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QToolButton" name="toolButton">
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index 9468e96..0fe7c19 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -161,8 +161,9 @@ QString SftpPlugin::mountPoint()
 
 void SftpPlugin::onMounted()
 {
+    kDebug(kdeconnect_kded()) << QString("Remote filesystem mounted at %1").arg(mountPoint());
     knotify(KNotification::Notification
-        , i18n("Filesystem mounted at %1").arg(mountPoint())
+        , i18n("Remote filesystem mounted")
         , KIconLoader::global()->loadIcon("drive-removable-media", KIconLoader::Desktop)
     );
     
diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
index 4c54459..0ca4218 100644
--- a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
+++ b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
@@ -76,7 +76,6 @@ void KdeConnectDeclarativePlugin::initializeEngine(QDeclarativeEngine* engine, c
     engine->rootContext()->setContextProperty("SftpDbusInterfaceFactory"
       , new ObjectFactory(engine, createSftpInterface));
     
-    
     engine->rootContext()->setContextProperty("DBusResponseFactory"
       , new ObjectFactory(engine, createDBusResponse));    
     

-- 
kdeconnect packaging