Bump glib requirement to 2.34

This is still rather old but does drop Ubuntu 12.04 support.

diff --git a/configure.ac b/configure.ac
index 744c96d371b028fd6e347467ea8c31bebf1d339b..38af3a72235fed4e77fd0ac13ad4356db5eb9ef3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -190,11 +190,11 @@ dnl *********************************************************************
 dnl ** GLIB *************************************************************
 dnl *********************************************************************
 
-AM_PATH_GLIB_2_0([2.32.0], [], [AC_MSG_ERROR([Glib not found!])], [gmodule gobject gio])
+AM_PATH_GLIB_2_0([2.34.0], [], [AC_MSG_ERROR([Glib not found!])], [gmodule gobject gio])
 COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 COMMON_LIBS="$GLIB_LIBS"
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], [Dont warn using older APIs])
-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevents using newer APIs])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_34], [Dont warn using older APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_34], [Prevents using newer APIs])
 
 dnl *********************************************************************
 dnl ** GTK **************************************************************

diff --git a/src/common/servlist.c b/src/common/servlist.c
index 33ed308ec5a7fc05b5456cefcf5113e802cd3d7d..871c23a4a0f6180dfb8953c7f692b14d907840f9 100644 (file)
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -363,42 +363,6 @@ static const struct defaultserver def[] =
 
 GSList *network_list = 0;
 
-#if !GLIB_CHECK_VERSION(2,34,0)
-#define g_slist_copy_deep servlist_slist_copy_deep
-/* FIXME copy-paste from gslist.c, should be dumped sometime */
-static GSList*
-servlist_slist_copy_deep (GSList *list, GCopyFunc func, gpointer user_data)
-{
-  GSList *new_list = NULL;
-
-  if (list)
-    {
-      GSList *last;
-
-      new_list = g_slice_new (GSList);
-      if (func)
-        new_list->data = func (list->data, user_data);
-      else
-        new_list->data = list->data;
-      last = new_list;
-      list = list->next;
-      while (list)
-        {
-          last->next = g_slice_new (GSList);
-          last = last->next;
-          if (func)
-            last->data = func (list->data, user_data);
-          else
-            last->data = list->data;
-          list = list->next;
-        }
-      last->next = NULL;
-    }
-
-  return new_list;
-}
-#endif
-
 favchannel *
 servlist_favchan_copy (favchannel *fav)
 {