[gst-cvs] gstreamer: registry: Substitute deprecated GLib symbol: g_mapped_file_free

[Sebastian Dröge]

Module: gstreamer
Branch: master
Commit: ca974b1a8fb9e11f7cfdbe9be290ece9ab41085e
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=ca974b1a8fb9e11f7cfdbe9be290ece9ab41085e

Author: Javier Jardón <jjardon at gnome.org>
Date:   Thu Dec  3 19:48:11 2009 +0100

registry: Substitute deprecated GLib symbol: g_mapped_file_free

Use g_mapped_file_unref if Glib >= 2.22 is available

Fixes bug #560442.

---

 gst/gstregistrybinary.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index 576ab02..42b010e 100644
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -524,7 +524,11 @@ gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
   if (contents == NULL) {
     /* Error mmap-ing the cache, try a plain memory read */
     if (mapped) {
+#if GLIB_CHECK_VERSION(2,22,0)
+      g_mapped_file_unref (mapped);
+#else
       g_mapped_file_free (mapped);
+#endif
       mapped = NULL;
     }
 
@@ -602,7 +606,11 @@ Error:
   g_timer_destroy (timer);
 #endif
   if (mapped) {
+#if GLIB_CHECK_VERSION(2,22,0)
+    g_mapped_file_unref (mapped);
+#else
     g_mapped_file_free (mapped);
+#endif
   } else {
     g_free (contents);
   }