Merge branch 'wip/carlosg/font-settings-lookups-3-24' into 'gtk-3-24'

gdk/wayland: Look for font settings recursively (3.24)

See merge request GNOME/gtk!3219
This commit is contained in:
Matthias Clasen
2021-02-18 17:18:19 +00:00

View File

@@ -380,15 +380,11 @@ update_xft_settings (GdkScreen *screen)
}
else
{
GSettingsSchemaSource *source;
GSettingsSchema *schema;
TranslationEntry *entry;
source = g_settings_schema_source_get_default ();
schema = g_settings_schema_source_lookup (source,
"org.gnome.desktop.interface",
FALSE);
entry = find_translation_entry_by_schema ("org.gnome.desktop.interface", "font-antialiasing");
if (schema && g_settings_schema_has_key (schema, "font-antialiasing"))
if (entry && entry->valid)
{
settings = g_hash_table_lookup (screen_wayland->settings,
"org.gnome.desktop.interface");