diff options
| author | Brian Cameron <Brian.Cameron@Oracle.COM> | 2011-05-19 18:36:56 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@Oracle.COM> | 2011-05-19 18:36:56 -0500 |
| commit | 62c19ec5d67bf3f4279607012d04f2ef948a63d5 (patch) | |
| tree | a6590b93758a67a3bce19d366197a54ec9ebdda5 | |
| parent | 924a1fc94005a90a375da9a1eee03778118429c4 (diff) | |
| download | gdm-62c19ec5d67bf3f4279607012d04f2ef948a63d5.tar.gz | |
Do not set WINDOWPATH if it is NULL.
| -rw-r--r-- | 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 b8ec8d7c..577b2ee2 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")); |