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 :)
29 lines
825 B
C
29 lines
825 B
C
/**
|
|
* SPDX-FileCopyrightText: 2014 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
#ifndef KDECONNECT_DBUSHELPER_H
|
|
#define KDECONNECT_DBUSHELPER_H
|
|
#include <QString>
|
|
#include <QDBusConnection>
|
|
|
|
#include "kdeconnectcore_export.h"
|
|
|
|
#define KDECONNECT_PRIVATE_DBUS_ADDR "${KDECONNECT_PRIVATE_DBUS_ADDR}"
|
|
#define KDECONNECT_PRIVATE_DBUS_NAME "${KDECONNECT_PRIVATE_DBUS_NAME}"
|
|
|
|
#define KDECONNECT_SESSION_DBUS_LAUNCHD_ENV "DBUS_LAUNCHD_SESSION_BUS_SOCKET"
|
|
|
|
namespace DBusHelper {
|
|
void KDECONNECTCORE_EXPORT filterNonExportableCharacters(QString& s);
|
|
|
|
#ifdef Q_OS_MAC
|
|
void KDECONNECTCORE_EXPORT launchDBusDaemon();
|
|
void KDECONNECTCORE_EXPORT closeDBusDaemon();
|
|
void KDECONNECTCORE_EXPORT macosUnsetLaunchctlEnv();
|
|
#endif
|
|
}
|
|
|
|
#endif
|