From 05d69a8d486fde2c2764aa09ebfbeee8c45e4870 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 31 Oct 2013 14:20:24 +0000 Subject: [PATCH 10/17] Avoid GLib 2.32, 2.34 deprecations --- configure.ac | 5 ++--- telepathy-logger/dbus-service.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 16a297f..34ca0d6 100644 --- a/configure.ac +++ b/configure.ac @@ -76,9 +76,8 @@ AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables]) AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header]) GLIB_REQUIRED=2.34 -dnl MIN_REQUIRED must stay to 2.30 because of GValueArray -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_34], [Prevent post 2.32 APIs]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_34], [Ignore post 2.34 deprecations]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_34], [Prevent post 2.34 APIs]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c index 1bc79f9..f53332e 100644 --- a/telepathy-logger/dbus-service.c +++ b/telepathy-logger/dbus-service.c @@ -412,7 +412,7 @@ pendingproc_get_favourite_contacts (TplActionChain *action_chain, priv = closure->service->priv; - packed = g_ptr_array_new_with_free_func ((GDestroyNotify) g_value_array_free); + packed = g_ptr_array_new_with_free_func ((GDestroyNotify) tp_value_array_free); g_hash_table_foreach (priv->accounts_contacts_map, (GHFunc) append_favourite_contacts_account_and_contacts, packed); -- 1.8.4.rc3