telepathy-haze: Work around GValueArray deprecation

[Xavier Claessens]

Module: telepathy-haze
Branch: master
Commit: 69f00e7be3a9a4984570d1e7fe4eafb4ba61f077
URL:    http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=69f00e7be3a9a4984570d1e7fe4eafb4ba61f077

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Mon May 27 13:17:16 2013 +0200

Work around GValueArray deprecation

We define GLIB_VERSION_MIN_REQUIRED to GLIB_VERSION_2_30 to ignore
post 2.30 deprecations. Note that this does not bump required glib
version, it is still 2.22. With glib < 2.32 it won't have any effect.

---

 configure.ac                  |    4 ++++
 src/connection-capabilities.c |    2 ++
 src/connection-mail.c         |    1 +
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1c973af..d0709f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ PKG_CHECK_MODULES(TP_GLIB,[telepathy-glib >= 0.15.1])
 PKG_CHECK_MODULES(GLIB,[glib-2.0 >= 2.22, gobject-2.0, gio-2.0])
 PKG_CHECK_MODULES(DBUS_GLIB,[dbus-glib-1 >= 0.73])
 
+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_30], [Prevent post 2.30 APIs])
+
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
diff --git a/src/connection-capabilities.c b/src/connection-capabilities.c
index 951dc02..76bb378 100644
--- a/src/connection-capabilities.c
+++ b/src/connection-capabilities.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include "config.h"
+
 #include "connection-capabilities.h"
 
 #include <telepathy-glib/contacts-mixin.h>
diff --git a/src/connection-mail.c b/src/connection-mail.c
index 84d5efd..475e652 100644
--- a/src/connection-mail.c
+++ b/src/connection-mail.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#include "config.h"
 
 #include "extensions/extensions.h"