From cce36ae701571753094c8ab9892c69e0bf5fb55e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Apr 2021 14:53:00 -0400
Subject: [PATCH] wayland: Improve font setting fallback more

We may get a response from the portal that contains
no useful settings at all. In that case, we should
fallback as well.

Fixes: #3838
---
 gdk/wayland/gdkdisplay-wayland.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index c071b4e4c5..ba36d0bb82 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -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);