f1843cb492
Better patch to replace !218. - Auto and quick detection of previous D-Bus instance; - Remove private D-Bus compile definition, only use it on macOS without an existing D-Bus instance; - Safe reboot after crashes because the indicator is not relating on the kdeconnectd to run a D-Bus session; - Safe exit after clicking on `Quit` in the systray. More details in commit logs: Only enable private D-Bus on macOS because the other platforms do not need them. The app should be able to easily detect the session bus from the env DBUS_LAUNCHD_SESSION_BUS_SOCKET from launchd through launchctl. Because https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/dbus/dbus-sysdeps-unix.c#L4392 shows that it is the only probing method on macOS with launchd. The D-Bus session bus can be easily found from launchd/launchctl with DBUS_LAUNCHD_SESSION_BUS_SOCKET env. It can be an external one (installed from HomeBrew) or an internal one (launched by a previous instance followed by a crash). The indicator helper on macOS can now automatically detect whether we can use a potentially (with launchd/launchctl env set, or KDE Connect macOS private_bus_address set) existed and usable session bus. If previous bus is usable, just try to launch the kdeconnectd with us. Otherwise, launch a private D-Bus daemon, export the launchd/launchctl env, and run a kdeconnectd instance. Everything works better and quicker now :)
51 lines
1.6 KiB
C++
51 lines
1.6 KiB
C++
/**
|
|
* SPDX-FileCopyrightText: 2019 Nicolas Fella <nicolas.fella@gmx.de>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
#include "notificationserverinfo.h"
|
|
|
|
#include <QDBusMessage>
|
|
#include <QDBusPendingReply>
|
|
#include <QDBusPendingCallWatcher>
|
|
|
|
#include "dbushelper.h"
|
|
|
|
#include "core_debug.h"
|
|
|
|
NotificationServerInfo& NotificationServerInfo::instance()
|
|
{
|
|
static NotificationServerInfo instance;
|
|
return instance;
|
|
}
|
|
|
|
void NotificationServerInfo::init()
|
|
{
|
|
QDBusMessage query = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.Notifications"), QStringLiteral("/org/freedesktop/Notifications"), QStringLiteral("org.freedesktop.Notifications"), QStringLiteral("GetCapabilities"));
|
|
|
|
QDBusPendingReply<QStringList> reply = QDBusConnection::sessionBus().asyncCall(query);
|
|
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
|
|
connect(watcher, &QDBusPendingCallWatcher::finished, this, [this, reply, watcher] {
|
|
watcher->deleteLater();
|
|
|
|
if (reply.isError()) {
|
|
qCWarning(KDECONNECT_CORE) << "Could not query capabilities from notifications server";
|
|
return;
|
|
}
|
|
|
|
if (reply.value().contains(QLatin1String("x-kde-display-appname"))) {
|
|
m_supportedHints |= X_KDE_DISPLAY_APPNAME;
|
|
}
|
|
|
|
if (reply.value().contains(QLatin1String("x-kde-origin-name"))) {
|
|
m_supportedHints |= X_KDE_ORIGIN_NAME;
|
|
}
|
|
});
|
|
}
|
|
|
|
NotificationServerInfo::Hints NotificationServerInfo::supportedHints()
|
|
{
|
|
return m_supportedHints;
|
|
}
|
|
|