diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-19 10:44:12 -0400 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-19 10:44:12 -0400 |
| commit | 440cf63332708e09cc8a5fbcdcec32fa52d59ad2 (patch) | |
| tree | 8cede6c690dce89da50a82a6b06f140f91366754 /libedataserver | |
| parent | 5363199a247d8844811cc0baa81f52234088554b (diff) | |
| download | evolution-data-server-440cf63332708e09cc8a5fbcdcec32fa52d59ad2.tar.gz | |
Work around deprecation of g_mapped_file_free().
Fixes compilation errors when building against latest GLib.
This is a temporary fix until GLib 2.22 is released.
Diffstat (limited to 'libedataserver')
| -rw-r--r-- | libedataserver/e-xml-utils.c | 4 | ||||
| -rw-r--r-- | libedataserver/md5-utils.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libedataserver/e-xml-utils.c b/libedataserver/e-xml-utils.c index 8901ce32c..3c8abe176 100644 --- a/libedataserver/e-xml-utils.c +++ b/libedataserver/e-xml-utils.c @@ -50,7 +50,11 @@ e_xml_parse_file (const gchar *filename) if (mapped_file) { result = xmlParseMemory (g_mapped_file_get_contents (mapped_file), g_mapped_file_get_length (mapped_file)); +#if GLIB_CHECK_VERSION(2,21,3) + g_mapped_file_unref (mapped_file); +#else g_mapped_file_free (mapped_file); +#endif } return result; } diff --git a/libedataserver/md5-utils.c b/libedataserver/md5-utils.c index 4ef3780b3..ceb64804a 100644 --- a/libedataserver/md5-utils.c +++ b/libedataserver/md5-utils.c @@ -362,5 +362,9 @@ md5_get_digest_from_file (const gchar *filename, guchar digest[16]) md5_get_digest (contents, length, digest); +#if GLIB_CHECK_VERSION(2,21,3) + g_mapped_file_unref (mapped_file); +#else g_mapped_file_free (mapped_file); +#endif } |