gdm r5797 - in branches/gnome-2-20: . daemon

[bcameron svn gnome org]

Author: bcameron
Date: Tue Feb 19 01:33:50 2008
New Revision: 5797
URL: http://svn.gnome.org/viewvc/gdm?rev=5797&view=rev

Log:
2008-02-18 Brian Cameron <brian cameron sun com>

        * daemon/slave.c: Get the environment value for XDG_DATA_DIRS
          before calling ve_clearenv.  This issue was noticed while
          discussing bug #510358.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/daemon/slave.c

Modified: branches/gnome-2-20/daemon/slave.c
==============================================================================
--- branches/gnome-2-20/daemon/slave.c	(original)
+++ branches/gnome-2-20/daemon/slave.c	Tue Feb 19 01:33:50 2008
@@ -3563,6 +3563,7 @@
 		   gboolean savesess,
 		   gboolean savelang)
 {
+	const char *old_system_data_dirs;
 	char *sessionexec = NULL;
 	GString *fullexec = NULL;
 	const char *shell = NULL;
@@ -3633,6 +3634,10 @@
 		gdm_child_exit (DISPLAY_REMANAGE,
 				_("%s: Execution of PreSession script returned > 0. Aborting."), "session_child_run");
 
+	old_system_data_dirs = g_getenv ("XDG_DATA_DIRS") ?
+			       g_getenv ("XDG_DATA_DIRS") :
+			       "/usr/local/share/:/usr/share/";
+
 	ve_clearenv ();
 
 	/* Prepare user session */
@@ -3686,13 +3691,8 @@
 	 * using a different display manager.
 	 */
 	{
-		const char *old_system_data_dirs;
 		char *new_system_data_dirs;
 
-		old_system_data_dirs = g_getenv ("XDG_DATA_DIRS") ?
-				       g_getenv ("XDG_DATA_DIRS") :
-				       "/usr/local/share/:/usr/share/";
-
 		new_system_data_dirs = g_build_path (":",
 			 old_system_data_dirs, DATADIR "/gdm/", NULL);