[gdm] daemon: move WINDOWPATH setting up top of get_welcome_environment

[Ray Strode <halfline src gnome org>]

commit 5496a723837c029892f68a37a29afa5627cb4679
Author: Ray Strode <rstrode redhat com>
Date:   Fri May 20 09:58:23 2011 -0400

    daemon: move WINDOWPATH setting up top of get_welcome_environment
    
    At the top of the function we loop through "optional" environment
    variables and set them in the welcome environment only if they are
    already set in the slave environment.
    
    After commit 62c19ec5d67bf3f4279607012d04f2ef948a63d5 WINDOWPATH
    is optional now as well.
    
    This commit consolidates the WINDOWPATH setting code with the other
    optional environment variable code at the top.

 daemon/gdm-welcome-session.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index 577b2ee..438a95a 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -354,7 +354,7 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
                 "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
-                "LC_IDENTIFICATION", "LC_ALL",
+                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
                 NULL
         };
         int i;
@@ -438,12 +438,6 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
 
         g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
 
-        windowpath = g_getenv ("WINDOWPATH");
-        if (windowpath != NULL)
-        {
-                g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (windowpath));
-        }
-
         g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
         g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
         g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));