luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a destroy notify for the user_data in the binding api

Browse Source
This commit is contained in:
Matthias Clasen 2010-04-16 15:47:30 -04:00
parent 741a4cb25f
commit a55ec73fa4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gsettings.c
View File

@ -1062,6 +1062,7 @@ typedef struct
GSettingsBindGetMapping get_mapping;
GSettingsBindSetMapping set_mapping;
gpointer user_data;
GDestroyNotify destroy;
guint property_handler_id;
const GParamSpec *property;
@ -1091,6 +1092,9 @@ g_settings_binding_free (gpointer data)
g_variant_type_free (binding->type);
g_object_unref (binding->settings);
if (binding->destroy)
binding->destroy (binding->user_data);
g_slice_free (GSettingsBinding, binding);
}
@ -1506,7 +1510,7 @@ g_settings_bind (GSettings *settings,
GSettingsBindFlags flags)
{
g_settings_bind_with_mapping (settings, key, object, property,
flags, NULL, NULL, NULL);
flags, NULL, NULL, NULL, NULL);
}
/**
@ -1521,6 +1525,7 @@ g_settings_bind (GSettings *settings,
* @set_mapping: a function that gets called to convert values
* from @object to @settings, or %NULL to use the default GIO mapping
* @user_data: data that gets passed to @get_mapping and @set_mapping
* @destroy: #GDestroyNotify function for @user_data
*
* Create a binding between the @key in the @settings object
* and the property @property of @object, using the provided mapping
@ -1541,7 +1546,8 @@ g_settings_bind_with_mapping (GSettings *settings,
GSettingsBindFlags flags,
GSettingsBindGetMapping get_mapping,
GSettingsBindSetMapping set_mapping,
gpointer user_data)
gpointer user_data,
GDestroyNotify destroy)
{
GSettingsBinding *binding;
GObjectClass *objectclass;
@ -1558,6 +1564,7 @@ g_settings_bind_with_mapping (GSettings *settings,
binding->property = g_object_class_find_property (objectclass, property);
binding->running = FALSE;
binding->user_data = user_data;
binding->destroy = destroy;
binding->get_mapping = get_mapping ? get_mapping : g_settings_get_mapping;
binding->set_mapping = set_mapping ? set_mapping : g_settings_set_mapping;

3
gio/gsettings.h
View File

@ -192,7 +192,8 @@ void g_settings_bind_with_mapping (GSettin
GSettingsBindFlags flags,
GSettingsBindGetMapping get_mapping,
GSettingsBindSetMapping set_mapping,
gpointer user_data);
gpointer user_data,
GDestroyNotify destroy);
void g_settings_unbind (gpointer object,
const gchar *key);