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

Fix crashing on start with proxy set, properly set all proxy env vars

master-1.22
Scott Balneaves 2013-04-08 15:44:59 -05:00
parent ec2d4f7060
commit 14885e3eee
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal-screen.c
View File

@ -1406,7 +1406,7 @@ get_child_environment (TerminalScreen *screen,
list_schemas = g_settings_list_schemas(); list_schemas = g_settings_list_schemas();
schema_exists = FALSE; schema_exists = FALSE;
for (i = 0; list_schemas[i] != NULL; i++) { for (i = 0; list_schemas[i] != NULL; i++) {
if (g_strcmp0 (list_schemas[i], "org.gnome.system.proxy") == 0) if (g_strcmp0 (list_schemas[i], CONF_PROXY_SCHEMA) == 0)
{ {
schema_exists = TRUE; schema_exists = TRUE;
break; break;

52
src/terminal-util.c
View File

@ -593,15 +593,12 @@ setup_http_proxy_env (GHashTable *env_table,
{ {
gchar *host; gchar *host;
gint port; gint port;
GSList *ignore;
if (!g_settings_get_boolean (settings_http, "use-http-proxy"))
return;
host = gsettings_get_string (settings_http, "host"); host = gsettings_get_string (settings_http, "host");
port = g_settings_get_int (settings_http, "port"); port = g_settings_get_int (settings_http, "port");
if (host && port) if (host && port)
{ {
GString *buf = g_string_sized_new (64); GString *buf = g_string_sized_new (64);
g_string_append (buf, "http://"); g_string_append (buf, "http://");
@ -628,7 +625,15 @@ setup_http_proxy_env (GHashTable *env_table,
} }
g_free (host); g_free (host);
gchar **ignore_strv = g_settings_get_strv (settings_http, "ignore-hosts"); }
static void
setup_ignore_host_env (GHashTable *env_table,
GSettings *settings)
{
GSList *ignore;
gchar **ignore_strv = g_settings_get_strv (settings, "ignore-hosts");
ignore = terminal_gsettings_strv_to_gslist (ignore_strv); ignore = terminal_gsettings_strv_to_gslist (ignore_strv);
if (ignore) if (ignore)
{ {
@ -654,13 +659,13 @@ setup_http_proxy_env (GHashTable *env_table,
static void static void
setup_https_proxy_env (GHashTable *env_table, setup_https_proxy_env (GHashTable *env_table,
GSettings *settings) GSettings *settings_https)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = gsettings_get_string (settings, "secure-host"); host = gsettings_get_string (settings_https, "host");
port = g_settings_get_int (settings, "secure-port"); port = g_settings_get_int (settings_https, "port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -673,13 +678,13 @@ setup_https_proxy_env (GHashTable *env_table,
static void static void
setup_ftp_proxy_env (GHashTable *env_table, setup_ftp_proxy_env (GHashTable *env_table,
GSettings *settings) GSettings *settings_ftp)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = gsettings_get_string (settings, "ftp-host"); host = gsettings_get_string (settings_ftp, "host");
port = g_settings_get_int (settings, "ftp-port"); port = g_settings_get_int (settings_ftp, "port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -692,13 +697,13 @@ setup_ftp_proxy_env (GHashTable *env_table,
static void static void
setup_socks_proxy_env (GHashTable *env_table, setup_socks_proxy_env (GHashTable *env_table,
GSettings *settings) GSettings *settings_socks)
{ {
gchar *host; gchar *host;
gint port; gint port;
host = gsettings_get_string (settings, "socks-host"); host = gsettings_get_string (settings_socks, "host");
port = g_settings_get_int (settings, "socks-port"); port = g_settings_get_int (settings_socks, "port");
if (host && port) if (host && port)
{ {
char *proxy; char *proxy;
@ -736,19 +741,21 @@ void
terminal_util_add_proxy_env (GHashTable *env_table) terminal_util_add_proxy_env (GHashTable *env_table)
{ {
char *proxymode; char *proxymode;
GSettings *settings = g_settings_new (CONF_PROXY_SCHEMA);
GSettings *settings, *settings_http; GSettings *settings_http = g_settings_new (CONF_HTTP_PROXY_SCHEMA);
settings = g_settings_new (CONF_PROXY_SCHEMA); GSettings *settings_https = g_settings_new (CONF_HTTPS_PROXY_SCHEMA);
settings_http = g_settings_new (CONF_HTTP_PROXY_SCHEMA); GSettings *settings_ftp = g_settings_new (CONF_FTP_PROXY_SCHEMA);
GSettings *settings_socks = g_settings_new (CONF_SOCKS_PROXY_SCHEMA);
/* If mode is not manual, nothing to set */ /* If mode is not manual, nothing to set */
proxymode = gsettings_get_string (settings, "mode"); proxymode = gsettings_get_string (settings, "mode");
if (proxymode && 0 == strcmp (proxymode, "manual")) if (proxymode && 0 == strcmp (proxymode, "manual"))
{ {
setup_http_proxy_env (env_table, settings_http); setup_http_proxy_env (env_table, settings_http);
setup_https_proxy_env (env_table, settings); setup_ignore_host_env (env_table, settings);
setup_ftp_proxy_env (env_table, settings); setup_https_proxy_env (env_table, settings_https);
setup_socks_proxy_env (env_table, settings); setup_ftp_proxy_env (env_table, settings_ftp);
setup_socks_proxy_env (env_table, settings_socks);
} }
else if (proxymode && 0 == strcmp (proxymode, "auto")) else if (proxymode && 0 == strcmp (proxymode, "auto"))
{ {
@ -758,6 +765,9 @@ terminal_util_add_proxy_env (GHashTable *env_table)
g_free (proxymode); g_free (proxymode);
g_object_unref (settings); g_object_unref (settings);
g_object_unref (settings_http); g_object_unref (settings_http);
g_object_unref (settings_https);
g_object_unref (settings_ftp);
g_object_unref (settings_socks);
} }
/* Bidirectional object/widget binding */ /* Bidirectional object/widget binding */

3
src/terminal-util.h
View File

@ -29,6 +29,9 @@ G_BEGIN_DECLS
#define CONF_PROXY_SCHEMA "org.gnome.system.proxy" #define CONF_PROXY_SCHEMA "org.gnome.system.proxy"
#define CONF_HTTP_PROXY_SCHEMA "org.gnome.system.proxy.http" #define CONF_HTTP_PROXY_SCHEMA "org.gnome.system.proxy.http"
#define CONF_HTTPS_PROXY_SCHEMA "org.gnome.system.proxy.https"
#define CONF_FTP_PROXY_SCHEMA "org.gnome.system.proxy.ftp"
#define CONF_SOCKS_PROXY_SCHEMA "org.gnome.system.proxy.socks"
void terminal_util_set_unique_role (GtkWindow *window, const char *prefix); void terminal_util_set_unique_role (GtkWindow *window, const char *prefix);