[gdm] launch-environment: Don't set DCONF_PROFILE for gnome-initial-setup

[Mario Sanchez Prada <msanchez src gnome org>]

commit 67ef79c125c34b66072ae00927b2c89f2c98f196
Author: Daniel Drake <drake endlessm com>
Date:   Mon Jan 2 10:34:15 2017 -0600

    launch-environment: Don't set DCONF_PROFILE for gnome-initial-setup
    
    The locked down dconf profile should not be used for the initial setup
    session. This allows overridden values from the user profile to take
    effect.

 daemon/gdm-launch-environment.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index a7ae672..5fd346f 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -159,11 +159,16 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment,
         if (launch_environment->priv->session_mode != NULL) {
                 g_hash_table_insert (hash, g_strdup ("GNOME_SHELL_SESSION_MODE"), g_strdup 
(launch_environment->priv->session_mode));
 
-               /* Inital setup needs gvfs for fetching remote avatars. */
                if (strcmp (launch_environment->priv->session_mode, INITIAL_SETUP_SESSION_MODE) != 0) {
+                       /* gvfs is needed for fetching remote avatars in the initial setup. Disable it 
otherwise. */
                        g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1"));
                        g_hash_table_insert (hash, g_strdup ("GIO_USE_VFS"), g_strdup ("local"));
                        g_hash_table_insert (hash, g_strdup ("GVFS_REMOTE_VOLUME_MONITOR_IGNORE"), g_strdup 
("1"));
+
+                       /* The locked down dconf profile should not be used for the initial setup session.
+                        * This allows overridden values from the user profile to take effect.
+                        */
+                       g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
                }
         }
 
@@ -199,7 +204,6 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment,
         g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
 
         g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
-        g_hash_table_insert (hash, g_strdup ("DCONF_PROFILE"), g_strdup ("gdm"));
 
         return hash;
 }