luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

g_settings_bind: use canonical property name

Browse Source 
We were using the user-passed value of the @property argument for
several purposes in g_settings_bind(): error messages, binding
uniqueness (ie: one-binding-per-property-per-object) and most
importantly, connecting to the detailed notify:: signal.

The user may pass a string like "property_name" when the property's
canonical name is "property-name".  g_object_class_find_property() will
find the property under these circumstances, but a connection to
"notify::property_name" will not notice notifies emitted for
"property-name".

We can solve this by using the user's string to perform the lookup and
then using pspec->name for everything after that.

https://bugzilla.gnome.org/show_bug.cgi?id=684882
This commit is contained in:
Ryan Lortie 2012-10-15 19:28:28 -04:00 committed by Matthias Clasen
parent dace477c92
commit 1a20d56a89
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gsettings.c
View File

@ -2624,14 +2624,14 @@ g_settings_bind_with_mapping (GSettings *settings,
(binding->property->flags & G_PARAM_WRITABLE) == 0) (binding->property->flags & G_PARAM_WRITABLE) == 0)
{ {
g_critical ("g_settings_bind: property '%s' on class '%s' is not " g_critical ("g_settings_bind: property '%s' on class '%s' is not "
"writable", property, G_OBJECT_TYPE_NAME (object)); "writable", binding->property->name, G_OBJECT_TYPE_NAME (object));
return; return;
} }
if ((flags & G_SETTINGS_BIND_SET) && if ((flags & G_SETTINGS_BIND_SET) &&
(binding->property->flags & G_PARAM_READABLE) == 0) (binding->property->flags & G_PARAM_READABLE) == 0)
{ {
g_critical ("g_settings_bind: property '%s' on class '%s' is not " g_critical ("g_settings_bind: property '%s' on class '%s' is not "
"readable", property, G_OBJECT_TYPE_NAME (object)); "readable", binding->property->name, G_OBJECT_TYPE_NAME (object));
return; return;
} }
@ -2648,7 +2648,7 @@ g_settings_bind_with_mapping (GSettings *settings,
{ {
g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN " g_critical ("g_settings_bind: G_SETTINGS_BIND_INVERT_BOOLEAN "
"was specified, but property `%s' on type `%s' has " "was specified, but property `%s' on type `%s' has "
"type `%s'", property, G_OBJECT_TYPE_NAME (object), "type `%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
g_type_name ((binding->property->value_type))); g_type_name ((binding->property->value_type)));
return; return;
} }
@ -2671,7 +2671,7 @@ g_settings_bind_with_mapping (GSettings *settings,
{ {
g_critical ("g_settings_bind: property '%s' on class '%s' has type " g_critical ("g_settings_bind: property '%s' on class '%s' has type "
"'%s' which is not compatible with type '%s' of key '%s' " "'%s' which is not compatible with type '%s' of key '%s' "
"on schema '%s'", property, G_OBJECT_TYPE_NAME (object), "on schema '%s'", binding->property->name, G_OBJECT_TYPE_NAME (object),
g_type_name (binding->property->value_type), g_type_name (binding->property->value_type),
g_variant_type_dup_string (binding->key.type), key, g_variant_type_dup_string (binding->key.type), key,
g_settings_schema_get_id (settings->priv->schema)); g_settings_schema_get_id (settings->priv->schema));
@ -2692,7 +2692,7 @@ g_settings_bind_with_mapping (GSettings *settings,
if (flags & G_SETTINGS_BIND_SET) if (flags & G_SETTINGS_BIND_SET)
{ {
detailed_signal = g_strdup_printf ("notify::%s", property); detailed_signal = g_strdup_printf ("notify::%s", binding->property->name);
binding->property_handler_id = binding->property_handler_id =
g_signal_connect (object, detailed_signal, g_signal_connect (object, detailed_signal,
G_CALLBACK (g_settings_binding_property_changed), G_CALLBACK (g_settings_binding_property_changed),
@ -2720,7 +2720,7 @@ g_settings_bind_with_mapping (GSettings *settings,
g_settings_binding_key_changed (settings, binding->key.name, binding); g_settings_binding_key_changed (settings, binding->key.name, binding);
} }
binding_quark = g_settings_binding_quark (property); binding_quark = g_settings_binding_quark (binding->property->name);
g_object_set_qdata_full (object, binding_quark, g_object_set_qdata_full (object, binding_quark,
binding, g_settings_binding_free); binding, g_settings_binding_free);
} }