diff options
| author | Patrick Griffis <tingping@tingping.se> | 2016-04-05 12:18:27 -0400 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2016-04-07 18:27:37 -0700 |
| commit | a3e1a287ac111db2eb636ad4ceafd211f5eeb964 (patch) | |
| tree | 9aefbdcbddfe2277daf7481d6da0d64315456891 | |
| parent | f501e948ae30787ce1d714abb6c25b9cf83939dd (diff) | |
Bump glib requirement to 2.34
This is still rather old but does drop Ubuntu 12.04 support.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/common/servlist.c | 36 |
2 files changed, 3 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 744c96d3..38af3a72 100644 --- 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 33ed308e..871c23a4 100644 --- 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) { |