luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-15 20:18:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gsettings: Support per-desktop overrides in GSettingsAction

Browse Source 
Due to an oversight (I guess), per-desktop default values (which come
from override files such as this one:
https://github.com/endlessm/gnome-shell/blob/master/data/00_org.gnome.shell.gschema.override)
were not checked when getting a GSettings value via a `GSettingsAction`.

Per-desktop default values are correctly returned via all other
GSettings query paths (see calls to
`g_settings_schema_key_get_translated_default()`).

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2023-01-10 20:55:37 +00:00
parent 6d2705e016
commit b494b83405
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gsettings.c
View File

@ -3225,6 +3225,9 @@ g_settings_action_get_state (GAction *action)
if (value == NULL) if (value == NULL)
value = g_settings_schema_key_get_translated_default (&gsa->key); value = g_settings_schema_key_get_translated_default (&gsa->key);
if (value == NULL)
value = g_settings_schema_key_get_per_desktop_default (&gsa->key);
if (value == NULL) if (value == NULL)
value = g_variant_ref (gsa->key.default_value); value = g_variant_ref (gsa->key.default_value);