[gtk/gtk-3-24: 1/2] gdk/display-wayland: Don't bypass portal for theme entries




commit de360b374550b6f30b0bf75bfe557bcb5c0cde00
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Jan 4 14:29:13 2022 +0100

    gdk/display-wayland: Don't bypass portal for theme entries
    
    When commit 49589e1da added support for the new high-contrast key,
    it missed that the getter should only use the setting directly when
    not going through the portal.
    
    https://gitlab.gnome.org/GNOME/gtk/-/issues/4651

 gdk/wayland/gdkscreen-wayland.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index 890fc75a4a..90c12d8bff 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -1017,7 +1017,11 @@ set_theme_from_entry (GdkScreen        *screen,
   GSettingsSchema *schema = NULL;
   gboolean hc = FALSE;
 
-  settings = (GSettings *)g_hash_table_lookup (screen_wayland->settings, "org.gnome.desktop.a11y.interface");
+  if (screen_wayland->settings_portal == NULL)
+    {
+      settings = (GSettings *)g_hash_table_lookup (screen_wayland->settings,
+                                                   "org.gnome.desktop.a11y.interface");
+    }
 
   if (settings)
     g_object_get (settings, "settings-schema", &schema, NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]