terminal-screen: avoid deprecated 'g_settings_list_schemas'
parent
22601705ec
commit
3ff3f275df
|
@ -1394,7 +1394,7 @@ get_child_environment (TerminalScreen *screen,
|
||||||
GHashTableIter iter;
|
GHashTableIter iter;
|
||||||
GPtrArray *retval;
|
GPtrArray *retval;
|
||||||
guint i;
|
guint i;
|
||||||
const char * const *list_schemas;
|
gchar **list_schemas = NULL;
|
||||||
gboolean schema_exists;
|
gboolean schema_exists;
|
||||||
|
|
||||||
window = gtk_widget_get_toplevel (term);
|
window = gtk_widget_get_toplevel (term);
|
||||||
|
@ -1434,7 +1434,8 @@ get_child_environment (TerminalScreen *screen,
|
||||||
g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window))));
|
g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window))));
|
||||||
g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display)));
|
g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display)));
|
||||||
|
|
||||||
list_schemas = g_settings_list_schemas();
|
g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (), TRUE, &list_schemas, NULL);
|
||||||
|
|
||||||
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], CONF_PROXY_SCHEMA) == 0)
|
if (g_strcmp0 (list_schemas[i], CONF_PROXY_SCHEMA) == 0)
|
||||||
|
@ -1443,6 +1444,9 @@ get_child_environment (TerminalScreen *screen,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_strfreev (list_schemas);
|
||||||
|
|
||||||
if (schema_exists == TRUE) {
|
if (schema_exists == TRUE) {
|
||||||
terminal_util_add_proxy_env (env_table);
|
terminal_util_add_proxy_env (env_table);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue