[empathy] Revert "Revert "Remove deprecated call to g_mapped_file_free()""



commit aebda6a7210c525cdbd6e878c508fed99b4ab7ab
Author: Xavier Claessens <xclaesse gmail com>
Date:   Thu Sep 24 09:05:51 2009 +0200

    Revert "Revert "Remove deprecated call to g_mapped_file_free()""
    
    This reverts commit 0343c43f77ab5e59c614af0c0fa60d518d78a774.

 libempathy/empathy-log-store-empathy.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 69cbab7..9e51703 100644
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -27,14 +27,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-/* FIXME: g_mapped_file_free has been deprecated in GLib 2.22, but the
- * replacement symbol, g_mapped_file_unref is not available in older Glib
- * and we're not ready to bump our version requirement just for this. When
- * we're ready to bump our version requirement, just revert this patch. */
-#undef G_DISABLE_DEPRECATED
 #include <glib/gstdio.h>
-#define G_DISABLE_DEPRECATED
 
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/defs.h>
@@ -638,7 +631,7 @@ log_store_empathy_search_new (EmpathyLogStore *self,
       contents = g_mapped_file_get_contents (file);
       contents_casefold = g_utf8_casefold (contents, length);
 
-      g_mapped_file_free (file);
+      g_mapped_file_unref (file);
 
       if (strstr (contents_casefold, text_casefold))
         {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]