luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GSettings: add g_settings_range_check() API

Browse Source 
Checks if a given value is within the correct range for a key.
This commit is contained in:
Ryan Lortie 2010-10-04 03:33:06 -04:00
parent d6d76783ae
commit e81d856159
2 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gio/gsettings.c
View File

@ -925,8 +925,8 @@ g_settings_type_check (GSettingsKeyInfo *info,
}
static gboolean
g_settings_range_check (GSettingsKeyInfo *info,
GVariant *value)
g_settings_key_info_range_check (GSettingsKeyInfo *info,
GVariant *value)
{
if (info->minimum == NULL && info->strinfo == NULL)
return TRUE;
@ -940,7 +940,7 @@ g_settings_range_check (GSettingsKeyInfo *info,
g_variant_iter_init (&iter, value);
while (ok && (child = g_variant_iter_next_value (&iter)))
{
ok = g_settings_range_check (info, child);
ok = g_settings_key_info_range_check (info, child);
g_variant_unref (child);
}
@ -964,7 +964,7 @@ g_settings_range_fixup (GSettingsKeyInfo *info,
{
const gchar *target;
if (g_settings_range_check (info, value))
if (g_settings_key_info_range_check (info, value))
return g_variant_ref (value);
if (info->strinfo == NULL)
@ -1062,7 +1062,7 @@ g_settings_get_translated_default (GSettingsKeyInfo *info)
g_error_free (error);
}
else if (!g_settings_range_check (info, value))
else if (!g_settings_key_info_range_check (info, value))
{
g_warning ("Translated default `%s' for key `%s' in schema `%s' "
"is outside of valid range", info->unparsed, info->key,
@ -1459,7 +1459,7 @@ g_settings_set_value (GSettings *settings,
g_settings_get_key_info (&info, settings, key);
g_return_val_if_fail (g_settings_type_check (&info, value), FALSE);
g_return_val_if_fail (g_settings_range_check (&info, value), FALSE);
g_return_val_if_fail (g_settings_key_info_range_check (&info, value), FALSE);
g_settings_free_key_info (&info);
return g_settings_write_to_backend (&info, value);
@ -1995,7 +1995,7 @@ g_settings_get_has_unapplied (GSettings *settings)
G_DELAYED_SETTINGS_BACKEND (settings->priv->backend));
}
/* Extra API (reset, sync, get_child, is_writable, list_*, get_range) {{{1 */
/* Extra API (reset, sync, get_child, is_writable, list_*, ranges) {{{1 */
/**
* g_settings_reset:
* @settings: a #GSettings object
@ -2280,6 +2280,41 @@ g_settings_get_range (GSettings *settings,
return g_variant_ref_sink (g_variant_new ("(sv)", type, range));
}
/**
* g_settings_range_check:
* @settings: a #GSettings
* @key: the key to check
* @value: the value to check
* @returns: %TRUE if @value is valid for @key
*
* Checks if the given @value is of the correct type and within the
* permitted range for @key.
*
* This API is not intended to be used by normal programs -- they should
* already know what is permitted by their own schemas. This API is
* meant to be used by programs such as editors or commandline tools.
*
* It is a programmer error to give a @key that isn't contained in the
* schema for @settings.
*
* Since: 2.28
**/
gboolean
g_settings_range_check (GSettings *settings,
const gchar *key,
GVariant *value)
{
GSettingsKeyInfo info;
gboolean good;
g_settings_get_key_info (&info, settings, key);
good = g_settings_type_check (&info, value) &&
g_settings_key_info_range_check (&info, value);
g_settings_free_key_info (&info);
return good;
}
/* Binding {{{1 */
typedef struct
{
@ -2435,7 +2470,7 @@ g_settings_binding_property_changed (GObject *object,
return;
}
if (!g_settings_range_check (&binding->info, variant))
if (!g_settings_key_info_range_check (&binding->info, variant))
{
g_critical ("GObject property `%s' on a `%s' object is out of "
"schema-specified range for key `%s' of `%s': %s",

3
gio/gsettings.h
View File

@ -84,6 +84,9 @@ gchar ** g_settings_list_children (GSettin
gchar ** g_settings_list_keys (GSettings *settings);
GVariant * g_settings_get_range (GSettings *settings,
const gchar *key);
gboolean g_settings_range_check (GSettings *settings,
const gchar *key,
GVariant *value);
gboolean g_settings_set_value (GSettings *settings,
const gchar *key,