applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keyboard: make sure to retrieve the correct type from variants

Browse source 
When comparing the keyboard shortcut's default and current
values, we double-check what kind of variant the default
value is, but don't check that for the user value.

This ends up throwing lots of variant-related warnings, as
the user value may not be a plain string.

Fix that by checking the variant types both for the user and
the default value of the shortcut's settings.

https://bugzilla.gnome.org/show_bug.cgi?id=769310
This commit is contained in:
Georges Basile Stavracas Neto 2016-07-29 14:23:27 -03:00 • committed by Bastien Nocera
parent 3aa7cf6918
commit 00f1b53abb
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
panels/keyboard/cc-keyboard-item.c
View file

@ -60,6 +60,17 @@ static void cc_keyboard_item_finalize (GObject *object);
G_DEFINE_TYPE (CcKeyboardItem, cc_keyboard_item, G_TYPE_OBJECT) G_DEFINE_TYPE (CcKeyboardItem, cc_keyboard_item, G_TYPE_OBJECT)
static const gchar *
get_binding_from_variant (GVariant *variant)
{
if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING))
return g_variant_get_string (variant, NULL);
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_STRING_ARRAY))
return g_variant_get_strv (variant, NULL)[0];
else
return "";
}
static gboolean static gboolean
binding_from_string (const char *str, binding_from_string (const char *str,
guint *accelerator_key, guint *accelerator_key,
@ -574,18 +585,14 @@ cc_keyboard_item_is_value_default (CcKeyboardItem *self)
if (user_value) if (user_value)
{ {
GVariant *default_value; GVariant *default_value;
const gchar *default_binding; const gchar *default_binding, *user_binding;
default_value = g_settings_get_default_value (self->settings, self->key); default_value = g_settings_get_default_value (self->settings, self->key);
if (g_variant_is_of_type (default_value, G_VARIANT_TYPE_STRING)) default_binding = get_binding_from_variant (default_value);
default_binding = g_variant_get_string (default_value, NULL); user_binding = get_binding_from_variant (user_value);
else if (g_variant_is_of_type (default_value, G_VARIANT_TYPE_STRING_ARRAY))
default_binding = g_variant_get_strv (default_value, NULL)[0];
else
default_binding = "";
is_value_default = (g_strcmp0 (default_binding, g_variant_get_string (user_value, NULL)) == 0); is_value_default = (g_strcmp0 (default_binding, user_binding) == 0);
g_clear_pointer (&default_value, g_variant_unref); g_clear_pointer (&default_value, g_variant_unref);
} }