[glib] g_settings_get: only check for non-copying format string
- From: Lars Uebernickel <larsu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] g_settings_get: only check for non-copying format string
- Date: Mon, 9 Dec 2013 14:52:11 +0000 (UTC)
commit 0f1579e62cded436c3fbfbeaf3130c8d8ffcb01c
Author: Lars Uebernickel <lars uebernic de>
Date: Sun Dec 8 17:30:33 2013 +0100
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
gio/gsettings.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 62a1708..4a13443 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -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));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]