Changeset View
Changeset View
Standalone View
Standalone View
src/platformtheme/kdeplatformtheme.cpp
Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Line(s) | |||||
59 | static const QByteArray s_x11AppMenuServiceNamePropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_SERVICE_NAME"); | 59 | static const QByteArray s_x11AppMenuServiceNamePropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_SERVICE_NAME"); | ||
60 | static const QByteArray s_x11AppMenuObjectPathPropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_OBJECT_PATH"); | 60 | static const QByteArray s_x11AppMenuObjectPathPropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_OBJECT_PATH"); | ||
61 | 61 | | |||
62 | static const QByteArray s_waylandAppMenuServiceNamePropertyName = QByteArrayLiteral("KDE_APPMENU_SERVICE_NAME"); | 62 | static const QByteArray s_waylandAppMenuServiceNamePropertyName = QByteArrayLiteral("KDE_APPMENU_SERVICE_NAME"); | ||
63 | static const QByteArray s_waylandAppMenuObjectPathPropertyName = QByteArrayLiteral("KDE_APPMENU_OBJECT_PATH"); | 63 | static const QByteArray s_waylandAppMenuObjectPathPropertyName = QByteArrayLiteral("KDE_APPMENU_OBJECT_PATH"); | ||
64 | 64 | | |||
65 | static bool checkDBusGlobalMenuAvailable() | 65 | static bool checkDBusGlobalMenuAvailable() | ||
66 | { | 66 | { | ||
67 | if (qEnvironmentVariableIsSet("KDE_NO_GLOBAL_MENU")) { | ||||
68 | return false; | ||||
69 | } | ||||
70 | | ||||
67 | QDBusConnection connection = QDBusConnection::sessionBus(); | 71 | QDBusConnection connection = QDBusConnection::sessionBus(); | ||
68 | QString registrarService = QStringLiteral("com.canonical.AppMenu.Registrar"); | 72 | QString registrarService = QStringLiteral("com.canonical.AppMenu.Registrar"); | ||
69 | return connection.interface()->isServiceRegistered(registrarService); | 73 | return connection.interface()->isServiceRegistered(registrarService); | ||
70 | } | 74 | } | ||
71 | 75 | | |||
72 | static bool isDBusGlobalMenuAvailable() | 76 | static bool isDBusGlobalMenuAvailable() | ||
73 | { | 77 | { | ||
74 | static bool dbusGlobalMenuAvailable = checkDBusGlobalMenuAvailable(); | 78 | static bool dbusGlobalMenuAvailable = checkDBusGlobalMenuAvailable(); | ||
▲ Show 20 Lines • Show All 314 Lines • Show Last 20 Lines |