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

diff --git a/gio/gsettings.c b/gio/gsettings.c
index 62a1708..4a13443 100644 (file)
--- 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));
     }