diff --git a/core/daemon.cpp b/core/daemon.cpp index 6e786afdf..8fc430538 100644 --- a/core/daemon.cpp +++ b/core/daemon.cpp @@ -72,7 +72,7 @@ Daemon::Daemon(QObject* parent, bool testMode) else { d->m_linkProviders.insert(new LanLinkProvider()); #ifdef KDECONNECT_BLUETOOTH - d->mLinkProviders.insert(new BluetoothLinkProvider()); + d->m_linkProviders.insert(new BluetoothLinkProvider()); #endif } diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt index 84e014dd2..746904867 100644 --- a/plugins/sftp/CMakeLists.txt +++ b/plugins/sftp/CMakeLists.txt @@ -1,3 +1,7 @@ +# Find fusermount -- otherwise fallback to umount +find_program(HAVE_FUSERMOUNT fusermount) +configure_file(config-sftp.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-sftp.h ) + find_package(KF5 REQUIRED COMPONENTS Notifications KIO) set(kdeconnect_sftp_SRCS diff --git a/plugins/sftp/config-sftp.h.cmake b/plugins/sftp/config-sftp.h.cmake new file mode 100644 index 000000000..0692c2699 --- /dev/null +++ b/plugins/sftp/config-sftp.h.cmake @@ -0,0 +1 @@ +#cmakedefine01 HAVE_FUSERMOUNT diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp index 9756df9dc..2c1c9c371 100644 --- a/plugins/sftp/mounter.cpp +++ b/plugins/sftp/mounter.cpp @@ -27,6 +27,7 @@ #include #include "mountloop.h" +#include "config-sftp.h" #include "sftp_debug.h" #include "kdeconnectconfig.h" @@ -235,7 +236,11 @@ void Mounter::unmount(bool finished) m_proc->deleteLater(); //Free mount point (won't always succeed if the path is in use) +#if defined(HAVE_FUSERMOUNT) KProcess::execute(QStringList() << QStringLiteral("fusermount") << QStringLiteral("-u") << m_mountPoint, 10000); +#else + KProcess::execute(QStringList() << QStringLiteral("umount") << m_mountPoint, 10000); +#endif m_proc = nullptr; } m_started = false; diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 1665e39ed..79b1beaee 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -4,7 +4,7 @@ Name[ca]=Gestor d'URL de telèfons del KDE Connect Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect Name[da]=Telefon-URL-håndtering til KDE Connect -Name[es]=Administrador de URL de KDE Connect +Name[es]=Controlador de URL de teléfonos de KDE Connect Name[eu]=KDE Connect-en URL-kudeatzailea Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect Name[it]=Gestore URL del telefono di KDE Connect