luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gresource: Port to new GVDB API

Browse Source 
This should introduce no functional changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2018-08-01 14:31:57 +01:00
parent ce86a3aed7
commit 705dd2b9a9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gresource.c
View File

@ -489,7 +489,7 @@ g_resource_unref (GResource *resource)
{ {
if (g_atomic_int_dec_and_test (&resource->ref_count)) if (g_atomic_int_dec_and_test (&resource->ref_count))
{ {
gvdb_table_unref (resource->table); gvdb_table_free (resource->table);
g_free (resource); g_free (resource);
} }
} }
@ -546,13 +546,7 @@ g_resource_new_from_data (GBytes *data,
unref_data = TRUE; unref_data = TRUE;
} }
table = gvdb_table_new_from_data (g_bytes_get_data (data, NULL), table = gvdb_table_new_from_bytes (data, TRUE, error);
g_bytes_get_size (data),
TRUE,
g_bytes_ref (data),
(GvdbRefFunc)g_bytes_ref,
(GDestroyNotify)g_bytes_unref,
error);
if (unref_data) if (unref_data)
g_bytes_unref (data); g_bytes_unref (data);