diff options
author | Ryan Lortie <desrt@desrt.ca> | 2009-06-18 15:11:57 -0400 |
---|---|---|
committer | Ryan Lortie <desrt@desrt.ca> | 2009-06-18 15:11:57 -0400 |
commit | 6fe357965a420aa930599d0536fabb8ac80cedee (patch) | |
tree | 96ded86c0a7d4c0d2a5217e7ac77e26e05e8ceb6 | |
parent | 3c75004474b099ff695c0d3d1835c245a550f12f (diff) | |
download | gtk+-6fe357965a420aa930599d0536fabb8ac80cedee.tar.gz |
Use g_mapped_file_unref()
- drop deprecated use of g_mapped_file_free()
- bump glib version requirement
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | gtk/gtkiconcache.c | 4 | ||||
-rw-r--r-- | gtk/updateiconcache.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index fa205a733b..7249d78962 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0]) m4_define([gtk_binary_version], [2.10.0]) # required versions of other packages -m4_define([glib_required_version], [2.19.7]) +m4_define([glib_required_version], [2.21.3]) m4_define([pango_required_version], [1.20]) m4_define([atk_required_version], [1.13.0]) m4_define([cairo_required_version], [1.6]) diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 75f3ff0ed4..6a433fc97c 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -77,7 +77,7 @@ _gtk_icon_cache_unref (GtkIconCache *cache) g_print ("unmapping icon cache\n")); if (cache->map) - g_mapped_file_free (cache->map); + g_mapped_file_unref (cache->map); g_free (cache); } } @@ -135,7 +135,7 @@ _gtk_icon_cache_new_for_path (const gchar *path) { if (!_gtk_icon_cache_validate (&info)) { - g_mapped_file_free (map); + g_mapped_file_unref (map); g_warning ("Icon cache '%s' is invalid\n", cache_filename); goto done; diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c index edd68c03cf..627f49eb80 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c @@ -1415,11 +1415,11 @@ validate_file (const gchar *file) if (!_gtk_icon_cache_validate (&info)) { - g_mapped_file_free (map); + g_mapped_file_unref (map); return FALSE; } - g_mapped_file_free (map); + g_mapped_file_unref (map); return TRUE; } |