File clementine-gsd-dbus-shortcuts.patch of Package clementine

Overview Repositories Revisions Requests Users Attributes Meta

File clementine-gsd-dbus-shortcuts.patch of Package clementine (Revision 1861c3681d4a97bfe682251fa178624d)

Currently displaying revision 1861c3681d4a97bfe682251fa178624d , Show latest

From 681f986f0fc87847c18d44b76c75f3c08cca0247 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Wed, 9 Jan 2019 05:11:28 +0100
Subject: [PATCH] Fix global shortcuts using GSD D-Bus backend (#6251)

---
 src/core/globalshortcuts.cpp            |  4 +++-
 src/core/gnomeglobalshortcutbackend.cpp | 26 ++++++++++++++++---------
 src/core/gnomeglobalshortcutbackend.h   |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/core/globalshortcuts.cpp b/src/core/globalshortcuts.cpp
index 8aa7860dc..633fdc8a1 100644
--- a/src/core/globalshortcuts.cpp
+++ b/src/core/globalshortcuts.cpp
@@ -150,7 +150,9 @@ GlobalShortcuts::Shortcut GlobalShortcuts::AddShortcut(
 bool GlobalShortcuts::IsGsdAvailable() const {
 #ifdef HAVE_DBUS
   return QDBusConnection::sessionBus().interface()->isServiceRegistered(
-      GnomeGlobalShortcutBackend::kGsdService);
+             GnomeGlobalShortcutBackend::kGsdService) ||
+         QDBusConnection::sessionBus().interface()->isServiceRegistered(
+             GnomeGlobalShortcutBackend::kGsdService2);
 #else  // HAVE_DBUS
   return false;
 #endif
diff --git a/src/core/gnomeglobalshortcutbackend.cpp b/src/core/gnomeglobalshortcutbackend.cpp
index a0205cc9f..ffc82aeff 100644
--- a/src/core/gnomeglobalshortcutbackend.cpp
+++ b/src/core/gnomeglobalshortcutbackend.cpp
@@ -37,11 +37,11 @@
 #endif
 
 const char* GnomeGlobalShortcutBackend::kGsdService =
+    "org.gnome.SettingsDaemon.MediaKeys";
+const char* GnomeGlobalShortcutBackend::kGsdService2 =
     "org.gnome.SettingsDaemon";
 const char* GnomeGlobalShortcutBackend::kGsdPath =
     "/org/gnome/SettingsDaemon/MediaKeys";
-const char* GnomeGlobalShortcutBackend::kGsdInterface =
-    "org.gnome.SettingsDaemon.MediaKeys";
 
 GnomeGlobalShortcutBackend::GnomeGlobalShortcutBackend(GlobalShortcuts* parent)
     : GlobalShortcutBackend(parent),
@@ -50,17 +50,25 @@ GnomeGlobalShortcutBackend::GnomeGlobalShortcutBackend(GlobalShortcuts* parent)
 
 bool GnomeGlobalShortcutBackend::DoRegister() {
 #ifdef HAVE_DBUS
+
   qLog(Debug) << "registering";
-  // Check if the GSD service is available
-  if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(
-           kGsdService)) {
-    qLog(Warning) << "gnome settings daemon not registered";
-    return false;
+
+  if (!interface_) {
+    // Check if the GSD service is available
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(
+            kGsdService)) {
+      interface_ = new OrgGnomeSettingsDaemonMediaKeysInterface(
+          kGsdService, kGsdPath, QDBusConnection::sessionBus(), this);
+    } else if (QDBusConnection::sessionBus().interface()->isServiceRegistered(
+                   kGsdService2)) {
+      interface_ = new OrgGnomeSettingsDaemonMediaKeysInterface(
+          kGsdService2, kGsdPath, QDBusConnection::sessionBus(), this);
+    }
   }
 
   if (!interface_) {
-    interface_ = new OrgGnomeSettingsDaemonMediaKeysInterface(
-        kGsdService, kGsdPath, QDBusConnection::sessionBus(), this);
+    qLog(Warning) << "gnome settings daemon not registered";
+    return false;
   }
 
   QDBusPendingReply<> reply =
diff --git a/src/core/gnomeglobalshortcutbackend.h b/src/core/gnomeglobalshortcutbackend.h
index 3529d5866..ba19db45a 100644
--- a/src/core/gnomeglobalshortcutbackend.h
+++ b/src/core/gnomeglobalshortcutbackend.h
@@ -33,8 +33,8 @@ class GnomeGlobalShortcutBackend : public GlobalShortcutBackend {
   explicit GnomeGlobalShortcutBackend(GlobalShortcuts* parent);
 
   static const char* kGsdService;
+  static const char* kGsdService2;
   static const char* kGsdPath;
-  static const char* kGsdInterface;
 
  protected:
   bool RegisterInNewThread() const { return true; }

Places

File clementine-gsd-dbus-shortcuts.patch of Package clementine (Revision 1861c3681d4a97bfe682251fa178624d)

Places