Commit 6fe35796 authored by Allison Karlitskaya's avatar Allison Karlitskaya

Use g_mapped_file_unref()

  - drop deprecated use of g_mapped_file_free()
  - bump glib version requirement
parent 3c750044
......@@ -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])
......
......@@ -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;
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment