luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings: small internal refactor

Browse Source 
Add two boolean parameters to our internal getter utility function in
anticipation of the coming addition of g_settings_get_user_value() and
g_settings_get_default_value() APIs.

https://bugzilla.gnome.org/show_bug.cgi?id=668233
This commit is contained in:
Ryan Lortie 2013-10-27 10:33:08 -07:00
parent 84a6e651c2
commit 2d06dbeef1
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gio/gsettings.c
View File

@ -1048,14 +1048,19 @@ g_settings_write_to_backend (GSettings *settings,
static GVariant *
g_settings_read_from_backend (GSettings *settings,
GSettingsSchemaKey *key)
GSettingsSchemaKey *key,
gboolean user_value_only,
gboolean default_value)
{
GVariant *value;
GVariant *fixup;
gchar *path;
path = g_strconcat (settings->priv->path, key->name, NULL);
value = g_settings_backend_read (settings->priv->backend, path, key->type, FALSE);
if (user_value_only)
value = g_settings_backend_read_user_value (settings->priv->backend, path, key->type);
else
value = g_settings_backend_read (settings->priv->backend, path, key->type, default_value);
g_free (path);
if (value != NULL)
@ -1095,7 +1100,7 @@ g_settings_get_value (GSettings *settings,
g_return_val_if_fail (key != NULL, NULL);
g_settings_schema_key_init (&skey, settings->priv->schema, key);
value = g_settings_read_from_backend (settings, &skey);
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey);
@ -1151,7 +1156,7 @@ g_settings_get_enum (GSettings *settings,
return -1;
}
value = g_settings_read_from_backend (settings, &skey);
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey);
@ -1264,7 +1269,7 @@ g_settings_get_flags (GSettings *settings,
return -1;
}
value = g_settings_read_from_backend (settings, &skey);
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
value = g_settings_schema_key_get_translated_default (&skey);
@ -1522,7 +1527,7 @@ g_settings_get_mapped (GSettings *settings,
g_settings_schema_key_init (&skey, settings->priv->schema, key);
if ((value = g_settings_read_from_backend (settings, &skey)))
if ((value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE)))
{
okay = mapping (value, &result, user_data);
g_variant_unref (value);
@ -2405,7 +2410,7 @@ g_settings_binding_key_changed (GSettings *settings,
g_value_init (&value, binding->property->value_type);
variant = g_settings_read_from_backend (binding->settings, &binding->key);
variant = g_settings_read_from_backend (binding->settings, &binding->key, FALSE, FALSE);
if (variant && !binding->get_mapping (&value, variant, binding->user_data))
{
/* silently ignore errors in the user's config database */
@ -2952,7 +2957,7 @@ g_settings_action_get_state (GAction *action)
GSettingsAction *gsa = (GSettingsAction *) action;
GVariant *value;
value = g_settings_read_from_backend (gsa->settings, &gsa->key);
value = g_settings_read_from_backend (gsa->settings, &gsa->key, FALSE, FALSE);
if (value == NULL)
value = g_settings_schema_key_get_translated_default (&gsa->key);