From 539e56022362a4092eb5d941a00194065e5ec795 Mon Sep 17 00:00:00 2001
From: noskb <63541981+noskb@users.noreply.github.com>
Date: Sun, 7 Jun 2026 21:28:48 +0000
Subject: [PATCH] Remove duplicate buttons using xfconf-query

In the gnome-based template, xsettingsd was used to remove duplicate
buttons. However, since xfce-based templates use xfsettingsd,
xfconf-query is called at session startup to perform the same
configuration.
---
 Makefile                                                  | 2 ++
 .../xdgautostart/qubes-set-xsettings-xfconf-query.desktop | 8 ++++++++
 debian/qubes-gui-agent-xfce.install                       | 3 ++-
 rpm_spec/gui-agent.spec.in                                | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop

diff --git a/Makefile b/Makefile
index ff2cc4d9..194b7a69 100644
--- a/Makefile
+++ b/Makefile
@@ -239,6 +239,8 @@ endif
 		$(DESTDIR)/usr/lib/qubes/qubes-xorg-wrapper
 	install -D appvm-scripts/usr/lib/qubes/gtk4-workarounds.sh \
 		$(DESTDIR)/usr/lib/qubes/gtk4-workarounds.sh
+	install -m 0644 -D appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop \
+		$(DESTDIR)/etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
 ifeq ($(shell lsb_release -is), Debian)
 	install -D -m 0644 appvm-scripts/etc/pam.d/qubes-gui-agent.debian \
 		$(DESTDIR)/etc/pam.d/qubes-gui-agent
diff --git a/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop b/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop
new file mode 100644
index 00000000..d7650154
--- /dev/null
+++ b/appvm-scripts/etc/xdgautostart/qubes-set-xsettings-xfconf-query.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+TryExec=xfconf-query
+Exec=xfconf-query --channel xsettings --property /Gtk/DecorationLayout --create --type string --set ""
+Terminal=false
+Type=Application
+OnlyShowIn=X-QUBES;
diff --git a/debian/qubes-gui-agent-xfce.install b/debian/qubes-gui-agent-xfce.install
index b701d8c7..089bdd60 100644
--- a/debian/qubes-gui-agent-xfce.install
+++ b/debian/qubes-gui-agent-xfce.install
@@ -1 +1,2 @@
-etc/X11/Xsession.d/60xfce-desktop
\ No newline at end of file
+etc/X11/Xsession.d/60xfce-desktop
+etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
diff --git a/rpm_spec/gui-agent.spec.in b/rpm_spec/gui-agent.spec.in
index e4f8789e..8bbe0606 100644
--- a/rpm_spec/gui-agent.spec.in
+++ b/rpm_spec/gui-agent.spec.in
@@ -371,6 +371,7 @@ rm -f %{name}-%{version}
 
 %files xfce
 %{xinitrc_dir}/60xfce-desktop.sh
+/etc/xdg/autostart/qubes-set-xsettings-xfconf-query.desktop
 
 %files -n qubes-gui-vnc
 #/lib/systemd/system/qubes-gui-vncserver.service