[Xfce4-commits] <xfce4-session:nick/xfsettingsd-merge> Remove early xfsettingsd autostart and add it to the session.

[Nick Schermer]

Updating branch refs/heads/nick/xfsettingsd-merge
         to 8a90f1ba07050f87a8ea67cd9ae56f2b68ba976c (commit)
       from 64bc14b65c1253ca041d645dba03715e5a27a36f (commit)

commit 8a90f1ba07050f87a8ea67cd9ae56f2b68ba976c
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Feb 23 19:50:43 2011 +0100

    Remove early xfsettingsd autostart and add it to the session.
    
    The early startup is more of an ugly hack to get things working.
    As an alternative add xfsettingsd to the default session although
    it should automatically start because of the autostart desktop file.

 settings/xfce4-session.xml |   10 +++++-----
 xfce4-session/main.c       |    7 -------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/settings/xfce4-session.xml b/settings/xfce4-session.xml
index 49f19c4..a200a37 100644
--- a/settings/xfce4-session.xml
+++ b/settings/xfce4-session.xml
@@ -13,20 +13,20 @@
       </property>
       <property name="Client0_PerScreen" type="bool" value="false"/>
       <property name="Client1_Command" type="array">
-        <value type="string" value="xfce4-panel"/>
+        <value type="string" value="xfsettingsd"/>
       </property>
       <property name="Client1_PerScreen" type="bool" value="false"/>
       <property name="Client2_Command" type="array">
-        <value type="string" value="Thunar"/>
-        <value type="string" value="--daemon"/>
+        <value type="string" value="xfce4-panel"/>
       </property>
       <property name="Client2_PerScreen" type="bool" value="false"/>
       <property name="Client3_Command" type="array">
-        <value type="string" value="xfdesktop"/>
+        <value type="string" value="Thunar"/>
+        <value type="string" value="--daemon"/>
       </property>
       <property name="Client3_PerScreen" type="bool" value="false"/>
       <property name="Client4_Command" type="array">
-        <value type="string" value="xfce4-settings-helper"/>
+        <value type="string" value="xfdesktop"/>
       </property>
       <property name="Client4_PerScreen" type="bool" value="false"/>
     </property>
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index ff6e324..b8f57d3 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -143,13 +143,6 @@ init_display (XfsmManager   *manager,
 
   sm_init (channel, disable_tcp, manager);
 
-  /* start xfsettingsd */
-  if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
-  {
-    g_warning ("Could not start xfsettingsd");
-  }
-
-
   /* gtk resource files may have changed */
   gtk_rc_reparse_all ();
 }