From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 11 Jun 2009 16:41:16 +0000 (-0400)
Subject: Fix an oversight in the previous commit
X-Git-Tag: 2.21.2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a402875de1d8956c90a940f8309733040cda5afb;p=platform%2Fupstream%2Fglib.git

Fix an oversight in the previous commit

We don't want to unset DISPLAY etc, if none is specified in the
app launch context.
---

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index e2f4d7f..f0a0bbc 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -854,13 +854,9 @@ child_setup (gpointer user_data)
 
   if (data->display)
     g_setenv ("DISPLAY", data->display, TRUE);
-  else
-    g_unsetenv ("DISPLAY");
 
   if (data->sn_id)
     g_setenv ("DESKTOP_STARTUP_ID", data->sn_id, TRUE);
-  else
-    g_unsetenv ("DESKTOP_STARTUP_ID");
 }
 
 static gboolean