From 74fcb7a804d072361051faaa884ef6071edea65a Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 7 Mar 2012 11:04:18 +0100
Subject: Make use of new GLib macros to check API we are using

---
 configure.ac                  | 10 ++++------
 libempathy-gtk/empathy-chat.c |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 76d02e49d..3a0c72ddf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,12 @@ AC_COPYRIGHT([
 
 # Hardp deps
 FOLKS_REQUIRED=0.6.6
-GLIB_REQUIRED=2.30.0
 GNUTLS_REQUIRED=2.8.5
 
+GLIB_REQUIRED=2.30.0
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+
 GTK_REQUIRED=3.0.2
 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_0, [Ignore post 3.0 deprecations])
 AC_DEFINE(GDK_VERSION_MAX_REQUIRED, GDK_VERSION_3_0, [Prevent post 3.0 APIs])
@@ -70,11 +73,6 @@ CHAMPLAIN_REQUIRED=0.12.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# Disable GLib deprecation warnings for now; we don't want to bump the GLib dep
-# and make things harder for contributiors without good reason. We'll re-enable
-# those warnings later during the cycle (bgo #662662)
-AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
-
 # FIXME: bgo #669673
 AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated])
 
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index d273a3792..b98f52102 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,11 +26,12 @@
  */
 
 #include <config.h>
+/* for GCompletion */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
 #include <string.h>
 #include <stdlib.h>
 
-#undef G_DISABLE_DEPRECATED /* for GCompletion */
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-- 
cgit v1.2.3