gnome-session r5043 - in trunk: . data gnome-session

[vuntz svn gnome org]

Author: vuntz
Date: Tue Sep  2 14:17:32 2008
New Revision: 5043
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5043&view=rev

Log:
2008-09-02  Vincent Untz  <vuntz gnome org>

	* data/gnome-session.schemas.in:
	* gnome-session/main.c: (append_required_apps):
	Rename /desktop/gnome/session/required_components key to
	/desktop/gnome/session/required_components_list avoid potential clash
	that might happen because of the
	/desktop/gnome/session/required_components directory.


Modified:
   trunk/ChangeLog
   trunk/data/gnome-session.schemas.in
   trunk/gnome-session/main.c

Modified: trunk/data/gnome-session.schemas.in
==============================================================================
--- trunk/data/gnome-session.schemas.in	(original)
+++ trunk/data/gnome-session.schemas.in	Tue Sep  2 14:17:32 2008
@@ -71,8 +71,8 @@
          </locale>
       </schema>
       <schema>
-         <key>/schemas/desktop/gnome/session/required_components</key>
-         <applyto>/desktop/gnome/session/required_components</applyto>
+         <key>/schemas/desktop/gnome/session/required_components_list</key>
+         <applyto>/desktop/gnome/session/required_components_list</applyto>
          <owner>gnome</owner>
          <type>list</type>
          <list_type>string</list_type>

Modified: trunk/gnome-session/main.c
==============================================================================
--- trunk/gnome-session/main.c	(original)
+++ trunk/gnome-session/main.c	Tue Sep  2 14:17:32 2008
@@ -48,7 +48,7 @@
 
 #define GSM_GCONF_DEFAULT_SESSION_KEY           "/desktop/gnome/session/default_session"
 #define GSM_GCONF_REQUIRED_COMPONENTS_DIRECTORY "/desktop/gnome/session/required_components"
-#define GSM_GCONF_REQUIRED_COMPONENTS_KEY       "/desktop/gnome/session/required_components"
+#define GSM_GCONF_REQUIRED_COMPONENTS_LIST_KEY  "/desktop/gnome/session/required_components_list"
 
 #define GSM_DBUS_NAME "org.gnome.SessionManager"
 
@@ -314,7 +314,7 @@
 
         client = gconf_client_get_default ();
         required_components = gconf_client_get_list (client,
-                                                     GSM_GCONF_REQUIRED_COMPONENTS_KEY,
+                                                     GSM_GCONF_REQUIRED_COMPONENTS_LIST_KEY,
                                                      GCONF_VALUE_STRING,
                                                      NULL);