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

Merge branch 'master' into 1.x

Browse source 
# Conflicts:
#	urlhandler/org.kde.kdeconnect.telhandler.desktop
This commit is contained in:
Albert Vaca 2017-09-18 20:01:46 +02:00
commit 706ca3ebd0
5 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/daemon.cpp
View file

@ -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
}

4
plugins/sftp/CMakeLists.txt
View file

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

1
plugins/sftp/config-sftp.h.cmake Normal file
View file

@ -0,0 +1 @@
#cmakedefine01 HAVE_FUSERMOUNT

5
plugins/sftp/mounter.cpp
View file

@ -27,6 +27,7 @@
#include <KLocalizedString>
#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;

2
urlhandler/org.kde.kdeconnect.telhandler.desktop
View file

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