From 9c641b730dfe157c1380de19d9c8a87764150773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 27 Aug 2026 11:36:32 -0700
Subject: [PATCH 1/2] ShellKeyGrabber: namespace

---
 src/Services/ShellKeyGrabber.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Services/ShellKeyGrabber.vala b/src/Services/ShellKeyGrabber.vala
index 17d5788d..7a3e7576 100644
--- a/src/Services/ShellKeyGrabber.vala
+++ b/src/Services/ShellKeyGrabber.vala
@@ -40,7 +40,7 @@ public struct Accelerator {
 }
 
 [DBus (name = "org.gnome.Shell")]
-public interface ShellKeyGrabber : GLib.Object {
+public interface Sound.ShellKeyGrabber : GLib.Object {
     public abstract signal void accelerator_activated (uint action, GLib.HashTable<string, GLib.Variant> parameters_dict);
 
     public abstract uint grab_accelerator (string accelerator, ActionMode mode_flags, Meta.KeyBindingFlags grab_flags) throws GLib.DBusError, GLib.IOError;

From 57e91cce197208405dc3c40bf07aee639c164eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 27 Aug 2026 11:37:45 -0700
Subject: [PATCH 2/2] namespace all the things

---
 src/Services/ShellKeyGrabber.vala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Services/ShellKeyGrabber.vala b/src/Services/ShellKeyGrabber.vala
index 7a3e7576..ca2c708c 100644
--- a/src/Services/ShellKeyGrabber.vala
+++ b/src/Services/ShellKeyGrabber.vala
@@ -11,7 +11,7 @@
  * @POPUP: allow action while a shell menu is open
  */
 [Flags]
-public enum ActionMode {
+public enum Sound.ActionMode {
     NONE = 0,
     NORMAL = 1 << 0,
     OVERVIEW = 1 << 1,
@@ -24,7 +24,7 @@ public enum ActionMode {
 }
 
 [Flags]
-public enum Meta.KeyBindingFlags {
+public enum Sound.Meta.KeyBindingFlags {
     NONE = 0,
     PER_WINDOW = 1 << 0,
     BUILTIN = 1 << 1,
@@ -33,7 +33,7 @@ public enum Meta.KeyBindingFlags {
     IGNORE_AUTOREPEAT = 1 << 4,
 }
 
-public struct Accelerator {
+public struct Sound.Accelerator {
     public string name;
     public ActionMode mode_flags;
     public Meta.KeyBindingFlags grab_flags;