Unverified Commit 1cab9f80 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #302755 from NixOS/revert-302271-kglobalaccel-shortcuts-hack

Revert "kdePackages.kglobalacceld: hack around ksycoca breakage"
parents 68e38f42 8a71147d
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
{mkKdeDerivation}:
mkKdeDerivation {
  pname = "kglobalacceld";

  # Don't delete shortcuts when applications disappear from sycoca,
  # because for us they sometimes do.
  # FIXME: make them actually not do that instead.
  patches = [./dont-delete-shortcuts.patch];
}
+0 −14
Original line number Diff line number Diff line
diff --git a/src/globalshortcutsregistry.cpp b/src/globalshortcutsregistry.cpp
index 3cbaded..9adcf38 100644
--- a/src/globalshortcutsregistry.cpp
+++ b/src/globalshortcutsregistry.cpp
@@ -909,7 +909,8 @@ void GlobalShortcutsRegistry::refreshServices()
             return false;
         }
 
-        return true;
+        qCDebug(KGLOBALACCELD) << "NIXPKGS: component" << component->uniqueName() << "disappeared, keeping shortcuts anyway";
+        return false;
     });
 
     m_components.erase(it, m_components.end());