[Telepathy-commits] [telepathy-gabble/master] Depend on telepathy-glib 0.7.16 and GLib 2.16

[Simon McVittie]

We need tp-glib 0.7.16 for EnsureChannel, and it depends on GLib 2.16.
Now that we need a new GLib anyway, drop compatibility code for GLib < 2.12
---
 configure.ac    |   10 ++--------
 src/conn-olpc.c |   16 ----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index eaf5411..c0976fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,17 +112,11 @@ dnl Endianness (for the sha1 implementation)
 AC_C_BIGENDIAN
 
 dnl Check for Glib 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.10, gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16, gobject-2.0 >= 2.16])
 
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-dnl May be removed if we depend on glib-2.0 >= 2.12
-AC_CHECK_LIB(glib-2.0, g_hash_table_remove_all,
-  [ AC_DEFINE(HAS_G_HASH_TABLE_REMOVE_ALL, [],
-    [Whether g_hash_table_remove_all() function is provided by GLib]) ],
-  [], [$GLIB_LIBS])
-
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
@@ -132,7 +126,7 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95, dbus-glib-1 >= 0.73])
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
-PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.15])
+PKG_CHECK_MODULES(TP_GLIB, [telepathy-glib >= 0.7.16])
 
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index 751fef8..67e15d5 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -576,22 +576,6 @@ gabble_connection_connected_olpc (GabbleConnection *conn)
     }
 }
 
-#ifndef HAS_G_HASH_TABLE_REMOVE_ALL
-static gboolean
-_hash_table_remove_yes (gpointer key, gpointer value, gpointer user_data)
-{
-  return TRUE;
-}
-
-static void
-our_g_hash_table_remove_all (GHashTable *table)
-{
-  g_hash_table_foreach_remove (table, _hash_table_remove_yes, NULL);
-}
-
-#define g_hash_table_remove_all our_g_hash_table_remove_all
-#endif
-
 static void
 olpc_buddy_info_set_properties (GabbleSvcOLPCBuddyInfo *iface,
                                 GHashTable *properties,
-- 
1.5.6.5