[empathy] Revert "Remove deprecated call to g_mapped_file_free()"
- From: Davyd Madeley <davyd src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy] Revert "Remove deprecated call to g_mapped_file_free()"
- Date: Wed, 15 Jul 2009 11:40:53 +0000 (UTC)
commit 0343c43f77ab5e59c614af0c0fa60d518d78a774
Author: Davyd Madeley <davyd madeley id au>
Date: Wed Jul 15 12:38:55 2009 +0100
Revert "Remove deprecated call to g_mapped_file_free()"
This commit breaks older GLib. When we're ready to bump our requirement to
GLib 2.22, simply revert this commit.
This reverts commit 0ade362fb9343ec984c396a202565c4e5faa1f12 but with an
extra comment to explain what the hell is going on.
libempathy/empathy-log-store-empathy.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/libempathy/empathy-log-store-empathy.c b/libempathy/empathy-log-store-empathy.c
index 1314688..b814def 100644
--- a/libempathy/empathy-log-store-empathy.c
+++ b/libempathy/empathy-log-store-empathy.c
@@ -27,7 +27,14 @@
#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 "empathy-log-store.h"
#include "empathy-log-store-empathy.h"
@@ -601,7 +608,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_unref (file);
+ g_mapped_file_free (file);
if (strstr (contents_casefold, text_casefold))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]