Merge branch 'stable'

This commit is contained in:
Aleix Pol 2015-09-10 20:26:43 +02:00
commit 501e5431ec
2 changed files with 4 additions and 1 deletions

View file

@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.kde.kdeconnect
Exec=${LIBEXEC_INSTALL_DIR}/kdeconnectd
Exec=@KDE_INSTALL_FULL_LIBEXECDIR@/kdeconnectd

View file

@ -23,6 +23,9 @@
QString DaemonDbusInterface::activatedService() {
static const QString service = "org.kde.kdeconnect";
QDBusConnection::sessionBus().interface()->startService(service);
if (!QDBusConnection::sessionBus().interface()->isValid()) {
qWarning() << "error activating kdeconnectd:" << QDBusConnection::sessionBus().interface()->lastError();
}
return service;
}