[gdm] Do not set WINDOWPATH if it is NULL.

[Brian Cameron <bcameron src gnome org>]

commit 62c19ec5d67bf3f4279607012d04f2ef948a63d5
Author: Brian Cameron <Brian Cameron Oracle COM>
Date:   Thu May 19 18:36:56 2011 -0500

    Do not set WINDOWPATH if it is NULL.

 daemon/gdm-welcome-session.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
index b8ec8d7..577b2ee 100644
--- a/daemon/gdm-welcome-session.c
+++ b/daemon/gdm-welcome-session.c
@@ -358,6 +358,7 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
                 NULL
         };
         int i;
+        char *windowpath;
 
         load_lang_config_file (LANG_CONFIG_FILE,
                                (const char **) optional_environment);
@@ -436,7 +437,13 @@ get_welcome_environment (GdmWelcomeSession *welcome_session,
         }
 
         g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
-        g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH")));
+
+        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"));