[epiphany/gnome-3-6] ephy-profile-utils: don't replace environment when spwaning ephy-profile-migrator

[Stefano Facchini <sfacchini src gnome org>]

commit 8b19a6fbea87a1fbaf4de568b5ccbcd5362cb6b8
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Thu Sep 6 23:15:08 2012 +0200

    ephy-profile-utils: don't replace environment when spwaning ephy-profile-migrator
    
    Instead, just append the new variable to the existing environment.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683538

 lib/ephy-profile-utils.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c
index 51dd7e1..07c9605 100644
--- a/lib/ephy-profile-utils.c
+++ b/lib/ephy-profile-utils.c
@@ -208,7 +208,13 @@ ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run,
   int status;
   char *argv[6] = { EPHY_PROFILE_MIGRATOR, "-v" };
   int i = 2; /* index for argv, start filling at 2. */
-  char *envp[1] = { "EPHY_LOG_MODULES=ephy-profile" };
+  char **envp;
+
+  envp = g_environ_setenv (g_get_environ (),
+                           "EPHY_LOG_MODULES", "ephy-profile",
+                           TRUE);
+  /* To avoid breaking test-ephy-migrator */
+  envp = g_environ_unsetenv (envp, EPHY_UUID_ENVVAR);
 
   argv[i++] = version = g_strdup_printf ("%d", EPHY_PROFILE_MIGRATION_VERSION);
 
@@ -234,6 +240,7 @@ ephy_profile_utils_do_migration (const char *profile_directory, int test_to_run,
                       &status, &error);
   g_free (index);
   g_free (version);
+  g_strfreev (envp);
     
   if (error) {
     LOG ("Failed to run migrator: %s", error->message);