From 02f0b57c13614de676a6f141d31e3d8196fea0f0 Mon Sep 17 00:00:00 2001
From: Andrew Sayers <andrew-github.com@pileofstuff.org>
Date: Thu, 20 Feb 2025 13:53:10 +0000
Subject: [PATCH] Avoid spurious warnings when dbus.service stops

Services in this project generate a warning when they lose ownership of their
D-Bus name, which happens routinely when dbus.service exits
(e.g. when the user logs out).

Stop services before dbus.service exits, to avoid this warning.
---
 document-portal/xdg-document-portal.service.in  | 2 ++
 document-portal/xdg-permission-store.service.in | 2 ++
 src/xdg-desktop-portal.service.in               | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/document-portal/xdg-document-portal.service.in b/document-portal/xdg-document-portal.service.in
index 2c90589e3..d10fdbe34 100644
--- a/document-portal/xdg-document-portal.service.in
+++ b/document-portal/xdg-document-portal.service.in
@@ -1,6 +1,8 @@
 [Unit]
 Description=flatpak document portal service
 PartOf=graphical-session.target
+Requires=dbus.service
+After=dbus.service
 
 [Service]
 BusName=org.freedesktop.portal.Documents
diff --git a/document-portal/xdg-permission-store.service.in b/document-portal/xdg-permission-store.service.in
index e26c2b9f8..66fe6d5eb 100644
--- a/document-portal/xdg-permission-store.service.in
+++ b/document-portal/xdg-permission-store.service.in
@@ -1,6 +1,8 @@
 [Unit]
 Description=sandboxed app permission store
 PartOf=graphical-session.target
+Requires=dbus.service
+After=dbus.service
 
 [Service]
 BusName=org.freedesktop.impl.portal.PermissionStore
diff --git a/src/xdg-desktop-portal.service.in b/src/xdg-desktop-portal.service.in
index 1f8a4559a..b279af5c0 100644
--- a/src/xdg-desktop-portal.service.in
+++ b/src/xdg-desktop-portal.service.in
@@ -1,6 +1,8 @@
 [Unit]
 Description=Portal service
 PartOf=graphical-session.target
+Requires=dbus.service
+After=dbus.service
 
 [Service]
 Type=dbus