dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename globalshortcuts GSD D-Bus backend to avoid confusion

Browse Source
This commit is contained in:
Jonas Kvinge
2019-01-24 20:17:50 +01:00
parent ad141c165b
commit 9983dc3138
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/globalshortcuts/globalshortcuts.cpp
View File

@@ -37,7 +37,7 @@
#include "globalshortcutbackend.h"
#ifdef HAVE_DBUS
# include "globalshortcutbackend-dbus.h"
# include "globalshortcutbackend-gsd.h"
#endif
#if defined(HAVE_X11) || defined(Q_OS_WIN)
# include "globalshortcutbackend-system.h"
@@ -80,7 +80,7 @@ GlobalShortcuts::GlobalShortcuts(QWidget *parent)
// Create backends - these do the actual shortcut registration
#ifdef HAVE_DBUS
dbus_backend_ = new GlobalShortcutBackendDBus(this);
dbus_backend_ = new GlobalShortcutBackendGSD(this);
#endif
#if defined(HAVE_X11) || defined(Q_OS_WIN)
@@ -134,7 +134,7 @@ GlobalShortcuts::Shortcut GlobalShortcuts::AddShortcut(const QString &id, const
bool GlobalShortcuts::IsGsdAvailable() const {
#ifdef HAVE_DBUS
return QDBusConnection::sessionBus().interface()->isServiceRegistered(GlobalShortcutBackendDBus::kGsdService) || QDBusConnection::sessionBus().interface()->isServiceRegistered(GlobalShortcutBackendDBus::kGsdService2);
return QDBusConnection::sessionBus().interface()->isServiceRegistered(GlobalShortcutBackendGSD::kGsdService) || QDBusConnection::sessionBus().interface()->isServiceRegistered(GlobalShortcutBackendGSD::kGsdService2);
#else
return false;
#endif