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

[Mario Sanchez Prada <msanchez src gnome org>]

commit 49dacac7728061636a04e3757670c874965d35be
Author: Mario Sanchez Prada <mario endlessm com>
Date:   Mon Apr 3 18:41:04 2017 +0200

    Revert "launch-environment: Don't set DCONF_PROFILE for gnome-initial-setup"
    
    This should never have landed in the first place (I committed it by mistake
    while pushing the patch for bug 780862) and according to the discussion in
    bug 780866, it seems clear that this is not an upstreamable patch, not at
    least in its current form.
    
    This reverts commit 67ef79c125c34b66072ae00927b2c89f2c98f196.

 daemon/gdm-launch-environment.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index 5fd346f..a7ae672 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -159,16 +159,11 @@ 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"));
                }
         }
 
@@ -204,6 +199,7 @@ 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;
 }