From f347117706c23f3d6ae82db4d5da858b75c7a3ca Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan@xfce.org>
Date: Mon, 8 Jul 2019 21:55:28 +0200
Subject: [PATCH] session: Serialize startup of xfsettings daemon

Bug: 15485

Avoid a possible race where xfsettings daemon would apply an XrandR
config while the window and compositor manager are starting, causing a
possible mismatch in configuration.
---
 settings/xfce4-session.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/settings/xfce4-session.xml b/settings/xfce4-session.xml
index 66d28dfa..03e62c37 100644
--- a/settings/xfce4-session.xml
+++ b/settings/xfce4-session.xml
@@ -10,14 +10,15 @@
       <property name="IsFailsafe" type="bool" value="true"/>
       <property name="Count" type="int" value="5"/>
       <property name="Client0_Command" type="array">
-        <value type="string" value="xfwm4"/>
+        <value type="string" value="xfsettingsd"/>
+        <value type="string" value="--no-daemon"/>
       </property>
-      <property name="Client0_Priority" type="int" value="15"/>
+      <property name="Client0_Priority" type="int" value="0"/>
       <property name="Client0_PerScreen" type="bool" value="false"/>
       <property name="Client1_Command" type="array">
-        <value type="string" value="xfsettingsd"/>
+        <value type="string" value="xfwm4"/>
       </property>
-      <property name="Client1_Priority" type="int" value="20"/>
+      <property name="Client1_Priority" type="int" value="15"/>
       <property name="Client1_PerScreen" type="bool" value="false"/>
       <property name="Client2_Command" type="array">
         <value type="string" value="xfce4-panel"/>
-- 
2.21.0