From 75ae0e04e14cb475cb0c7175450071c3d54634be Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 24 Feb 2021 16:36:19 +0100 Subject: [PATCH] gdk/wayland: Make more matched settings from the portal as valid Commit 97b5fad1315 was a forward port from a gtk3 patch, but the hunk was applied on the wrong bits of code. Ensure the initialization paths also do mark settings read from the portal as valid, so the checks for optional/newer settings actually have the expected result. It is also desirable to mark settings as valid after configuration changes (as that patch did effectively do), but not enough to fix all situations. --- gdk/wayland/gdkdisplay-wayland.c | 1 + 1 file changed, 1 insertion(+) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 88fab19d55..9448beda2d 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -1955,6 +1955,7 @@ init_settings (GdkDisplay *display) char *a = g_variant_print (v, FALSE); g_debug ("Using portal setting for %s %s: %s\n", schema_str, key, a); g_free (a); + entry->valid = TRUE; apply_portal_setting (entry, v, display); } else