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

Merge pull request #21 from rezso/master 

check schema installation before using it
master-1.22
Stefano Karapetsas 2013-03-26 15:36:48 -07:00
parent 7140bd291b 4f7f15a07b
commit 1531a0802e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/terminal-screen.c
View File

@ -23,6 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <gio/gio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -1360,6 +1361,8 @@ get_child_environment (TerminalScreen *screen,
GHashTableIter iter; GHashTableIter iter;
GPtrArray *retval; GPtrArray *retval;
guint i; guint i;
const char * const *list_schemas;
gboolean schema_exists;
window = gtk_widget_get_toplevel (term); window = gtk_widget_get_toplevel (term);
g_assert (window != NULL); g_assert (window != NULL);
@ -1400,7 +1403,18 @@ get_child_environment (TerminalScreen *screen,
g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (gtk_widget_get_display (window)))); g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (gtk_widget_get_display (window))));
#endif #endif
terminal_util_add_proxy_env (env_table); list_schemas = g_settings_list_schemas();
schema_exists = FALSE;
for (i = 0; list_schemas[i] != NULL; i++) {
if (g_strcmp0 (list_schemas[i], "org.gnome.system.proxy") == 0)
{
schema_exists = TRUE;
break;
}
}
if (schema_exists == TRUE) {
terminal_util_add_proxy_env (env_table);
}
retval = g_ptr_array_sized_new (g_hash_table_size (env_table)); retval = g_ptr_array_sized_new (g_hash_table_size (env_table));
g_hash_table_iter_init (&iter, env_table); g_hash_table_iter_init (&iter, env_table);