[gnome-terminal/gsettings] Use g_get_environ here

[Christian Persch <chpe src gnome org>]

commit 557adcb7b8ef3a90c1c7f95e7b45ade7837379cb
Author: Christian Persch <chpe gnome org>
Date:   Tue Nov 15 21:23:40 2011 +0100

    Use g_get_environ here
    
    ... and bump glib req to 2.31.0.

 configure.ac   |    2 +-
 src/terminal.c |   14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f785297..8b1d62f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ GNOME_DEBUG_CHECK
 
 AM_GLIB_GNU_GETTEXT
 
-GLIB_REQUIRED=2.26.0
+GLIB_REQUIRED=2.31.0
 GIO_REQUIRED=2.27.0
 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.1.0
 
diff --git a/src/terminal.c b/src/terminal.c
index 4003d28..ff25cb9 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -325,21 +325,15 @@ name_lost_cb (GDBusConnection *connection,
   g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->startup_id));
 
   string = g_string_new (NULL);
-  envv = g_listenv ();
-  envc = g_strv_length (envv);
-  for (i = 0; i < envc; ++i)
+  envv = g_get_environ ();
+  for (i = 0; envv[i]; ++i)
     {
-      const char *value;
-
-      value = g_getenv (envv[i]);
-      if (value == NULL)
-        continue;
-
       if (i > 0)
         g_string_append_c (string, '\0');
 
-      g_string_append_printf (string, "%s=%s", envv[i], value);
+      g_string_append (string, envv[i]);
     }
+  g_strfreev (envv);
 
   len = string->len;
   s = g_string_free (string, FALSE);