callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Fix a thinko in settings portal support

Browse Source 
When we decide to fall back because the settings portal
is not present, adhere to that decision elsewhere.
This commit is contained in:
Matthias Clasen
2018-11-05 18:32:40 -05:00
parent 64427e9878
commit 8ef21cb32f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/wayland/gdkscreen-wayland.c
View File

@ -346,7 +346,7 @@ update_xft_settings (GdkScreen *screen)
GsdXftSettings xft_settings; GsdXftSettings xft_settings;
double dpi; double dpi;
if (gdk_should_use_portal ()) if (screen_wayland->settings_portal)
{ {
TranslationEntry *entry; TranslationEntry *entry;
@ -822,7 +822,7 @@ set_value_from_entry (GdkScreen *screen,
GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen); GdkWaylandScreen *screen_wayland = GDK_WAYLAND_SCREEN (screen);
GSettings *settings; GSettings *settings;
if (gdk_should_use_portal ()) if (screen_wayland->settings_portal)
{ {
switch (entry->type) switch (entry->type)
{ {
@ -917,7 +917,7 @@ set_decoration_layout_from_entry (GdkScreen *screen,
GSettings *settings = NULL; GSettings *settings = NULL;
const char *session; const char *session;
if (gdk_should_use_portal ()) if (screen_wayland->settings_portal)
{ {
g_value_set_string (value, entry->fallback.s); g_value_set_string (value, entry->fallback.s);
return; return;