[gtk+] Use g_mapped_file_unref()
- From: Ryan Lortie <ryanl src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtk+] Use g_mapped_file_unref()
- Date: Thu, 18 Jun 2009 16:31:17 -0400 (EDT)
commit 6fe357965a420aa930599d0536fabb8ac80cedee
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Jun 18 15:11:57 2009 -0400
Use g_mapped_file_unref()
- drop deprecated use of g_mapped_file_free()
- bump glib version requirement
configure.in | 2 +-
gtk/gtkiconcache.c | 4 ++--
gtk/updateiconcache.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index fa205a7..7249d78 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 75f3ff0..6a433fc 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 edd68c0..627f49e 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]