diff --git a/glib/gdataset.c b/glib/gdataset.c index bec57d914..c18e13f06 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -1114,7 +1114,7 @@ g_datalist_id_update_atomic (GData **datalist, new_destroy = NULL; } - result = callback (key_id, &new_data, &new_destroy, user_data); + result = callback (&new_data, &new_destroy, user_data); if (data && !new_data) { diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h index c53455a06..228133c5f 100644 --- a/glib/gdatasetprivate.h +++ b/glib/gdatasetprivate.h @@ -40,7 +40,6 @@ G_BEGIN_DECLS /*< private > * GDataListUpdateAtomicFunc: - * @key_id: ID of the entry to update * @data: (inout) (nullable) (not optional): the existing data corresponding * to @key_id, and return location for the new value for it * @destroy_notify: (inout) (nullable) (not optional): the existing destroy @@ -52,8 +51,7 @@ G_BEGIN_DECLS * * Since: 2.80 */ -typedef gpointer (*GDataListUpdateAtomicFunc) (GQuark key_id, - gpointer *data, +typedef gpointer (*GDataListUpdateAtomicFunc) (gpointer *data, GDestroyNotify *destroy_notify, gpointer user_data); diff --git a/glib/tests/dataset.c b/glib/tests/dataset.c index e97545152..0b9c02a3f 100644 --- a/glib/tests/dataset.c +++ b/glib/tests/dataset.c @@ -469,8 +469,7 @@ test_datalist_id_remove_multiple_destroy_order (void) } static gpointer -_update_atomic_cb (GQuark key_id, - gpointer *data, +_update_atomic_cb (gpointer *data, GDestroyNotify *destroy_notify, gpointer user_data) { diff --git a/gobject/gobject.c b/gobject/gobject.c index d7f3d7a91..f73f3bf30 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -367,8 +367,7 @@ weak_ref_data_unlock (WeakRefData *wrdata) } static gpointer -weak_ref_data_get_or_create_cb (GQuark key_id, - gpointer *data, +weak_ref_data_get_or_create_cb (gpointer *data, GDestroyNotify *destroy_notify, gpointer user_data) {