summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-02-18 17:18:19 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-02-18 17:18:19 +0000
commita048da02d55c0dd1b88624a8cfd3f47edf16981e (patch)
treed5e4a19544b9eeca0420a3a86b8b245a83067efa
parentf56a5ee2600d338d81d401944209dd9020551403 (diff)
parent4d30400987d013b410bdff33f92bf67e2b814aa9 (diff)
downloadgtk+-a048da02d55c0dd1b88624a8cfd3f47edf16981e.tar.gz
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
-rw-r--r--gdk/wayland/gdkscreen-wayland.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index e52f9171c7..084c1e3d19 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -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");