Merge branch 'font-fallback-fix' into 'master'

wayland: Improve font setting fallback more

Closes #3838

See merge request GNOME/gtk!3412
This commit is contained in:
Matthias Clasen 2021-04-08 11:24:09 +00:00
commit 1c2238cc2a

View File

@ -1917,6 +1917,14 @@ init_settings (GdkDisplay *display)
g_variant_get (ret, "(a{sa{sv}})", &iter);
if (g_variant_n_children (ret) == 0)
{
g_debug ("Received no portal settings");
g_clear_pointer (&ret, g_variant_unref);
goto fallback;
}
while (g_variant_iter_loop (iter, "{s@a{sv}}", &schema_str, &val))
{
GVariantIter *iter2 = g_variant_iter_new (val);