g_settings_get: only check for non-copying format string

396d40af introduced a redundant call to g_variant_check_format_string().
Checking whether the format string copies all values is enough.

https://bugzilla.gnome.org/show_bug.cgi?id=719979
This commit is contained in:
Lars Uebernickel 2013-12-08 17:30:33 +01:00
parent 05f36e7ffc
commit 0f1579e62c

View File

@ -1528,9 +1528,9 @@ g_settings_get (GSettings *settings,
value = g_settings_get_value (settings, key);
if (!g_variant_check_format_string (value, format, TRUE))
if (strchr (format, '&'))
{
g_critical ("%s: invalid format string for key '%s' from schema '%s'. "
g_critical ("%s: the format string may not contain '&' (key '%s' from schema '%s'). "
"This call will probably stop working with a future version of glib.",
G_STRFUNC, key, g_settings_schema_get_id (settings->priv->schema));
}