From 79ecf9e0e3bed0b4290d88a0dfbd7e4acc1eb110 Mon Sep 17 00:00:00 2001
From: nobodysu <nobodysu@users.noreply.github.com>
Date: Thu, 6 Oct 2022 01:51:27 +0300
Subject: [PATCH] pre-cleanup2

---
 apparmor.d/groups/bus/ibus-x11               | 6 +-----
 apparmor.d/groups/gnome/gnome-control-center | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apparmor.d/groups/bus/ibus-x11 b/apparmor.d/groups/bus/ibus-x11
index 5d37385c2..f3f8064d4 100644
--- a/apparmor.d/groups/bus/ibus-x11
+++ b/apparmor.d/groups/bus/ibus-x11
@@ -11,6 +11,7 @@ include <tunables/global>
 profile ibus-x11 @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/dbus-session-strict>
+  include <abstractions/dbus-accessibility-strict>
   include <abstractions/dri-common>
   include <abstractions/dri-enumerate>
   include <abstractions/fonts>
@@ -21,11 +22,6 @@ profile ibus-x11 @{exec_path} flags=(attach_disconnected) {
 
   unix (connect, receive, send) type=stream peer=(label=ibus-daemon),
 
-  dbus send bus=accessibility path=/org/freedesktop/DBus
-       interface=org.freedesktop.DBus
-       member={Hello,AddMatch,RemoveMatch}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
-
   dbus send bus=session path=/org/a11y/bus
        interface=org.a11y.Bus
        member=GetAddress
diff --git a/apparmor.d/groups/gnome/gnome-control-center b/apparmor.d/groups/gnome/gnome-control-center
index 5359646c1..8b6ae0032 100644
--- a/apparmor.d/groups/gnome/gnome-control-center
+++ b/apparmor.d/groups/gnome/gnome-control-center
@@ -11,6 +11,7 @@ profile gnome-control-center @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
   include <abstractions/dbus-session>
+  include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus>
   include <abstractions/dconf-write>
   include <abstractions/dri-common>
@@ -36,11 +37,6 @@ profile gnome-control-center @{exec_path} flags=(attach_disconnected) {
 
   unix (send, receive, connect) type=stream peer=(addr="@/home/*/.cache/ibus/dbus-*", label=ibus-daemon),
 
-  dbus send bus=accessibility path=/org/freedesktop/DBus
-       interface=org.freedesktop.DBus
-       member={Hello,AddMatch}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
-
   dbus send bus=accessibility path=/org/a11y/atspi/accessible/root
        interface=org.a11y.atspi.Socket
        member=Embed