diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkobject.c | 12 | ||||
| -rw-r--r-- | gtk/gtkobject.h | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index af56761724..de51dbcc42 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -976,26 +976,24 @@ gtk_object_remove_data (GtkObject *object, } void -gtk_object_set_data_destroy_by_id (GtkObject *object, - GQuark key_id, - GDestroyNotify destroy_func) +gtk_object_remove_no_notify_by_id (GtkObject *object, + GQuark key_id) { g_return_if_fail (object != NULL); g_return_if_fail (GTK_IS_OBJECT (object)); - g_datalist_id_set_destroy (&object->object_data, key_id, destroy_func); + g_datalist_id_remove_no_notify (&object->object_data, key_id); } void gtk_object_set_data_destroy (GtkObject *object, - const gchar *key, - GDestroyNotify destroy_func) + const gchar *key) { g_return_if_fail (object != NULL); g_return_if_fail (GTK_IS_OBJECT (object)); g_return_if_fail (key != NULL); - g_datalist_set_destroy (&object->object_data, key, destroy_func); + g_datalist_remove_no_notify (&object->object_data, key); } void diff --git a/gtk/gtkobject.h b/gtk/gtkobject.h index 8360e06d8a..bc8ee893d6 100644 --- a/gtk/gtkobject.h +++ b/gtk/gtkobject.h @@ -279,9 +279,8 @@ void gtk_object_remove_data (GtkObject *object, const gchar *key); gpointer gtk_object_get_data (GtkObject *object, const gchar *key); -void gtk_object_set_data_destroy(GtkObject *object, - const gchar *key, - GDestroyNotify destroy_func); +void gtk_object_remove_no_notify(GtkObject *object, + const gchar *key); /* Set/get the "user_data" object data field of "object". It should * be noted that these functions are no different than calling @@ -317,9 +316,8 @@ gpointer gtk_object_get_data_by_id (GtkObject *object, GQuark data_id); void gtk_object_remove_data_by_id (GtkObject *object, GQuark data_id); -void gtk_object_set_data_destroy_by_id (GtkObject *object, - GQuark key_id, - GDestroyNotify destroy_func); +void gtk_object_remove_no_notify_by_id (GtkObject *object, + GQuark key_id); #define gtk_object_data_try_key g_quark_try_string #define gtk_object_data_force_id g_quark_from_string |