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

simplify some code, get rid of excessive data conversions

master-1.22
monsta 2015-12-02 13:11:19 +03:00
parent dc66bdf36d
commit 0b334ce4e8
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/terminal-util.c
View File

@ -37,8 +37,6 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#endif #endif
#include <libmate-desktop/mate-gsettings.h>
#include "terminal-accels.h" #include "terminal-accels.h"
#include "terminal-app.h" #include "terminal-app.h"
#include "terminal-intl.h" #include "terminal-intl.h"
@ -606,30 +604,23 @@ static void
setup_ignore_host_env (GHashTable *env_table, setup_ignore_host_env (GHashTable *env_table,
GSettings *settings) GSettings *settings)
{ {
GSList *ignore; gchar **ignore = g_settings_get_strv (settings, "ignore-hosts");
gchar **ignore_strv = g_settings_get_strv (settings, "ignore-hosts"); if (ignore == NULL)
return;
ignore = mate_gsettings_strv_to_gslist ((const gchar *const *)ignore_strv); GString *buf = g_string_sized_new (64);
if (ignore) int i;
for (i = 0; ignore[i] != NULL; ++i)
{ {
GString *buf = g_string_sized_new (64); if (buf->len)
while (ignore != NULL) g_string_append_c (buf, ',');
{ g_string_append (buf, ignore[i]);
GSList *old;
if (buf->len)
g_string_append_c (buf, ',');
g_string_append (buf, ignore->data);
old = ignore;
ignore = g_slist_next (ignore);
g_free (old->data);
g_slist_free_1 (old);
}
set_proxy_env (env_table, "no_proxy", g_string_free (buf, FALSE));
} }
if (ignore_strv)
g_strfreev(ignore_strv); set_proxy_env (env_table, "no_proxy", g_string_free (buf, FALSE));
g_strfreev(ignore);
} }
static void static void