[Xfce4-commits] <xfce4-session:master> Rename Xfconf property and doc updates.

[Nick Schermer]

Updating branch refs/heads/master
         to 1b99f90b2b8a66b957fd12755db1bdfeb61c7d83 (commit)
       from f483eeb12a94db0392ef9b4e1b9f5a4cbdc0b7d1 (commit)

commit 1b99f90b2b8a66b957fd12755db1bdfeb61c7d83
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Feb 18 17:45:01 2011 +0100

    Rename Xfconf property and doc updates.

 doc/manual/xfce4-session.xml |    6 ++----
 xfce4-session/Makefile.am    |    2 --
 xfce4-session/xfsm-manager.c |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/doc/manual/xfce4-session.xml b/doc/manual/xfce4-session.xml
index bfff0da..117ba41 100644
--- a/doc/manual/xfce4-session.xml
+++ b/doc/manual/xfce4-session.xml
@@ -154,11 +154,9 @@
         <term>Launch Gnome services on startup</term>
         <listitem>
           <para>Enable this option if you need the GNOME keyring daemon to be run
-          on startup. This option also instructs <application>&app;</application> to bring up the GNOME assistive
-          technologies at startup (if enabled in the GNOME control center). See the
-           GNOME documentation for more information on this topic.</para>
+          on startup.</para>
         </listitem>
-		  </varlistentry>
+      </varlistentry>
 
       <varlistentry>
         <term>Launch KDE services on startup</term>
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index b924051..b486cbb 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -51,7 +51,6 @@ xfce4_session_SOURCES =							\
 	xfsm-startup.h
 
 xfce4_session_CFLAGS =							\
-	$(GNOME_CFLAGS)							\
 	$(GNOME_KEYRING_CFLAGS)						\
 	$(LIBSM_CFLAGS)							\
 	$(LIBX11_CFLAGS)						\
@@ -78,7 +77,6 @@ xfce4_session_LDADD =							\
 	$(DBUS_GLIB_LIBS)						\
 	$(LIBWNCK_LIBS)							\
 	$(XFCONF_LIBS)							\
-	$(GNOME_LIBS)							\
 	$(GNOME_KEYRING_LIBS)
 
 xfce4_session_DEPENDENCIES =						\
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 5d9b790..598d47a 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -731,7 +731,7 @@ xfsm_manager_load (XfsmManager   *manager,
 
   manager->compat_gnome = xfconf_channel_get_bool (channel, "/compat/LaunchGNOME", FALSE);
   manager->compat_kde = xfconf_channel_get_bool (channel, "/compat/LaunchKDE", FALSE);
-  manager->start_at = xfconf_channel_get_bool (channel, "/general/StartAt", FALSE);
+  manager->start_at = xfconf_channel_get_bool (channel, "/general/StartAssistiveTechnologies", FALSE);
 
   display_name  = xfsm_gdk_display_get_fullname (gdk_display_get_default ());