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

gsettings: cleanup default value lookup

Browse Source 
There are a couple of different ways (and soon one more) to access the
default value of a key. Clean up the various places that access this to
avoid duplication.

https://bugzilla.gnome.org/show_bug.cgi?id=746592
This commit is contained in:
Allison Lortie 2017-08-02 11:06:03 +01:00 committed by Alberts Muktupāvels
parent df28cfe0b5
commit c2e7f31697
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gsettings.c
View File

@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE); value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL) if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey); value = g_settings_schema_key_get_default_value (&skey);
if (value == NULL)
value = g_variant_ref (skey.default_value);
g_settings_schema_key_clear (&skey); g_settings_schema_key_clear (&skey);
@ -1304,10 +1301,7 @@ g_settings_get_default_value (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, TRUE); value = g_settings_read_from_backend (settings, &skey, FALSE, TRUE);
if (value == NULL) if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey); value = g_settings_schema_key_get_default_value (&skey);
if (value == NULL)
value = g_variant_ref (skey.default_value);
g_settings_schema_key_clear (&skey); g_settings_schema_key_clear (&skey);
@ -1360,10 +1354,7 @@ g_settings_get_enum (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE); value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL) if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey); value = g_settings_schema_key_get_default_value (&skey);
if (value == NULL)
value = g_variant_ref (skey.default_value);
result = g_settings_schema_key_to_enum (&skey, value); result = g_settings_schema_key_to_enum (&skey, value);
g_settings_schema_key_clear (&skey); g_settings_schema_key_clear (&skey);
@ -1473,10 +1464,7 @@ g_settings_get_flags (GSettings *settings,
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE); value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL) if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey); value = g_settings_schema_key_get_default_value (&skey);
if (value == NULL)
value = g_variant_ref (skey.default_value);
result = g_settings_schema_key_to_flags (&skey, value); result = g_settings_schema_key_to_flags (&skey, value);
g_settings_schema_key_clear (&skey); g_settings_schema_key_clear (&skey);