gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use g_get_environ 

from
https://git.gnome.org/browse/gnome-terminal/commit?id=a9e294229521d91c916dba765c773fcf85260a5b
master-1.22
monsta 2016-01-13 10:49:46 +03:00
parent 0d20d5008b
commit 115663c4e2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/terminal.c
View File

@ -309,7 +309,7 @@ name_lost_cb (GDBusConnection *connection,
OwnData *data = (OwnData *) user_data; OwnData *data = (OwnData *) user_data;
GError *error = NULL; GError *error = NULL;
char **envv; char **envv;
int envc, i; int i;
GVariantBuilder builder; GVariantBuilder builder;
GVariant *value; GVariant *value;
GString *string; GString *string;
@ -345,21 +345,15 @@ name_lost_cb (GDBusConnection *connection,
g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->startup_id)); g_variant_builder_add (&builder, "@ay", string_to_ay (data->options->startup_id));
string = g_string_new (NULL); string = g_string_new (NULL);
envv = g_listenv (); envv = g_get_environ ();
envc = g_strv_length (envv); for (i = 0; envv[i]; ++i)
for (i = 0; i < envc; ++i)
{ {
const char *value;
value = g_getenv (envv[i]);
if (value == NULL)
continue;
if (i > 0) if (i > 0)
g_string_append_c (string, '\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; len = string->len;
s = g_string_free (string, FALSE); s = g_string_free (string, FALSE);