[gnome-terminal] Unset some env vars

[Christian Persch <chpe src gnome org>]

commit 9a6bbb598efb61ea36d055c824cef10a7bb5761a
Author: Christian Persch <chpe gnome org>
Date:   Sun Jun 13 19:40:08 2010 +0200

    Unset some env vars
    
    ... so they don't end up polluting the env in the terminal children.

 src/terminal.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/terminal.c b/src/terminal.c
index 3ee678b..b97b02a 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -572,11 +572,12 @@ main (int argc, char **argv)
 
   g_set_application_name (_("Terminal"));
   
-  /* Unset the startup ID, so it doesn't end up in the factory's env
-   * and thus in the terminals' envs.
+  /* Unset the these env variables, so they doesn't end up
+   * in the factory's env and thus in the terminals' envs.
    */
-  if (startup_id)
-    g_unsetenv ("DESKTOP_STARTUP_ID");
+  g_unsetenv ("DESKTOP_STARTUP_ID");
+  g_unsetenv ("GIO_LAUNCHED_DESKTOP_FILE_PID");
+  g_unsetenv ("GIO_LAUNCHED_DESKTOP_FILE");
 
  /* Do this here so that gdk_display is initialized */
   if (options->startup_id == NULL)