require GLib 2.16

GLib 2.16 was released more than 4 years ago.  Let's remove some cruft
from the glib_compat.h header, and avoid new cruft to it.

28 files changed, 5 insertions, 145 deletions

diff --git a/INSTALL b/INSTALL
index b07e1284c..cc6fbdc36 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,7 +13,7 @@ Dependencies
 gcc - http://gcc.gnu.org/
 Any other C99 compliant compiler should also work.
 
-GLib 2.12 - http://www.gtk.org/
+GLib 2.16 - http://www.gtk.org/
 General-purpose utility library.
 
 
diff --git a/Makefile.am b/Makefile.am
index 3588f0487..b349311fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1307,14 +1307,12 @@ test_run_inotify_LDADD = $(GLIB_LIBS)
 endif
 
 test_test_byte_reverse_SOURCES = \
-	test/test_glib_compat.h \
 	test/test_byte_reverse.c
 test_test_byte_reverse_LDADD = \
 	libutil.a \
 	$(GLIB_LIBS)
 
 test_test_pcm_SOURCES = \
-	test/test_glib_compat.h \
 	test/test_pcm_dither.c \
 	test/test_pcm_pack.c \
 	test/test_pcm_channels.c \
diff --git a/configure.ac b/configure.ac
index 4ba41727c..944cf5c3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,8 +456,8 @@ AC_ARG_WITH(tremor-includes,
 dnl ---------------------------------------------------------------------------
 dnl Mandatory Libraries
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12 gthread-2.0],,
-		[AC_MSG_ERROR([GLib 2.12 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16 gthread-2.0],,
+		[AC_MSG_ERROR([GLib 2.16 is required])])
 
 if test x$GCC = xyes; then
 	# suppress warnings in the GLib headers
diff --git a/src/conf.c b/src/conf.c
index 549ff51ef..167f2da92 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -23,7 +23,6 @@
 #include "string_util.h"
 #include "tokenizer.h"
 #include "path.h"
-#include "glib_compat.h"
 #include "mpd_error.h"
 
 #include <glib.h>
diff --git a/src/db/simple_db_plugin.c b/src/db/simple_db_plugin.c
index f11090828..697e8da5f 100644
--- a/src/db/simple_db_plugin.c
+++ b/src/db/simple_db_plugin.c
@@ -26,7 +26,6 @@
 #include "db_save.h"
 #include "db_lock.h"
 #include "conf.h"
-#include "glib_compat.h"
 #include "directory.h"
 
 #include <sys/types.h>
diff --git a/src/glib_compat.h b/src/glib_compat.h
index 989bf3b81..97d1fdc0c 100644
--- a/src/glib_compat.h
+++ b/src/glib_compat.h
@@ -28,64 +28,6 @@
 
 #include <glib.h>
 
-#if !GLIB_CHECK_VERSION(2,14,0)
-
-#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
-
-static inline GSource *
-g_timeout_source_new_seconds(guint interval)
-{
-	return g_timeout_source_new(interval * 1000);
-}
-
-static inline guint
-g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)
-{
-	return g_timeout_add(interval * 1000, function, data);
-}
-
-#endif /* !2.14 */
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-
-static inline void
-g_prefix_error(G_GNUC_UNUSED GError **error_r,
-	       G_GNUC_UNUSED const gchar *format, ...)
-{
-}
-
-static inline void
-g_propagate_prefixed_error(GError **dest_r, GError *src,
-			   G_GNUC_UNUSED const gchar *format, ...)
-{
-	g_propagate_error(dest_r, src);
-}
-
-static inline char *
-g_uri_escape_string(const char *unescaped,
-		    G_GNUC_UNUSED const char *reserved_chars_allowed,
-		    G_GNUC_UNUSED gboolean allow_utf8)
-{
-	return g_strdup(unescaped);
-}
-
-#endif /* !2.16 */
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-
-#include <string.h>
-
-static inline char *
-g_uri_parse_scheme(const char *uri)
-{
-	const char *end = strstr(uri, "://");
-	if (end == NULL)
-		return NULL;
-	return g_strndup(uri, end - uri);
-}
-
-#endif
-
 #if !GLIB_CHECK_VERSION(2,18,0)
 
 static inline void
diff --git a/src/input_init.c b/src/input_init.c
index e1698b64c..771d648d1 100644
--- a/src/input_init.c
+++ b/src/input_init.c
@@ -22,7 +22,6 @@
 #include "input_plugin.h"
 #include "input_registry.h"
 #include "conf.h"
-#include "glib_compat.h"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/io_thread.c b/src/io_thread.c
index 2091ecd05..7c080adcb 100644
--- a/src/io_thread.c
+++ b/src/io_thread.c
@@ -18,7 +18,6 @@
  */
 
 #include "io_thread.h"
-#include "glib_compat.h"
 
 #include <assert.h>
 
diff --git a/src/listen.c b/src/listen.c
index e2a40e93f..90e13b9c1 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -22,7 +22,6 @@
 #include "server_socket.h"
 #include "client.h"
 #include "conf.h"
-#include "glib_compat.h"
 #include "main.h"
 
 #include <string.h>
diff --git a/src/output/httpd_client.c b/src/output/httpd_client.c
index 8efedc2b3..72de90457 100644
--- a/src/output/httpd_client.c
+++ b/src/output/httpd_client.c
@@ -23,7 +23,6 @@
 #include "fifo_buffer.h"
 #include "page.h"
 #include "icy_server.h"
-#include "glib_compat.h"
 #include "glib_socket.h"
 
 #include <stdbool.h>
diff --git a/src/playlist/despotify_playlist_plugin.c b/src/playlist/despotify_playlist_plugin.c
index 08a32d79d..30b852c73 100644
--- a/src/playlist/despotify_playlist_plugin.c
+++ b/src/playlist/despotify_playlist_plugin.c
@@ -16,6 +16,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 #include "config.h"
 #include "playlist/despotify_playlist_plugin.h"
 #include "playlist_plugin.h"
@@ -25,7 +26,6 @@
 #include "tag.h"
 #include "song.h"
 #include "input_stream.h"
-#include "glib_compat.h"
 #include "despotify_utils.h"
 
 #include <glib.h>
diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c
index 86113643c..93768660c 100644
--- a/src/playlist/lastfm_playlist_plugin.c
+++ b/src/playlist/lastfm_playlist_plugin.c
@@ -25,7 +25,6 @@
 #include "uri.h"
 #include "song.h"
 #include "input_stream.h"
-#include "glib_compat.h"
 
 #include <glib.h>
 
diff --git a/src/playlist_list.c b/src/playlist_list.c
index 3d4edb9e1..68d24fe49 100644
--- a/src/playlist_list.c
+++ b/src/playlist_list.c
@@ -35,7 +35,6 @@
 #include "uri.h"
 #include "string_util.h"
 #include "conf.h"
-#include "glib_compat.h"
 #include "mpd_error.h"
 
 #include <assert.h>
diff --git a/src/resolver.c b/src/resolver.c
index 5d8d299c6..243b7cd02 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "resolver.h"
-#include "glib_compat.h"
 
 #ifndef G_OS_WIN32
 #include <sys/socket.h>
diff --git a/src/server_socket.c b/src/server_socket.c
index e4b5e3ece..396399596 100644
--- a/src/server_socket.c
+++ b/src/server_socket.c
@@ -27,7 +27,6 @@
 #include "socket_util.h"
 #include "resolver.h"
 #include "fd_util.h"
-#include "glib_compat.h"
 #include "glib_socket.h"
 
 #include <sys/types.h>
diff --git a/src/state_file.c b/src/state_file.c
index de7fa2d02..de0e70538 100644
--- a/src/state_file.c
+++ b/src/state_file.c
@@ -24,7 +24,6 @@
 #include "playlist_state.h"
 #include "volume.h"
 #include "text_file.h"
-#include "glib_compat.h"
 
 #include <glib.h>
 #include <assert.h>
diff --git a/src/tcp_connect.c b/src/tcp_connect.c
index 88e2348e6..291114f4b 100644
--- a/src/tcp_connect.c
+++ b/src/tcp_connect.c
@@ -21,7 +21,6 @@
 #include "tcp_connect.h"
 #include "fd_util.h"
 #include "io_thread.h"
-#include "glib_compat.h"
 #include "glib_socket.h"
 
 #include <assert.h>
diff --git a/src/update_archive.c b/src/update_archive.c
index e7cdcbdfd..3fb2bc18c 100644
--- a/src/update_archive.c
+++ b/src/update_archive.c
@@ -24,7 +24,6 @@
 #include "directory.h"
 #include "song.h"
 #include "mapper.h"
-#include "glib_compat.h"
 #include "archive_list.h"
 #include "archive_plugin.h"
 
diff --git a/src/update_container.c b/src/update_container.c
index 9fe4bb0a9..bda95dabe 100644
--- a/src/update_container.c
+++ b/src/update_container.c
@@ -25,7 +25,6 @@
 #include "directory.h"
 #include "song.h"
 #include "mapper.h"
-#include "glib_compat.h"
 #include "decoder_plugin.h"
 #include "tag.h"
 #include "tag_handler.h"
diff --git a/src/update_io.c b/src/update_io.c
index 887ebe2e5..c6a540a0f 100644
--- a/src/update_io.c
+++ b/src/update_io.c
@@ -21,6 +21,7 @@
 #include "update_io.h"
 #include "mapper.h"
 #include "directory.h"
+#include "glib_compat.h"
 
 #include <glib.h>
 
diff --git a/src/update_song.c b/src/update_song.c
index 5f06985a1..1126ad115 100644
--- a/src/update_song.c
+++ b/src/update_song.c
@@ -26,7 +26,6 @@
 #include "db_lock.h"
 #include "directory.h"
 #include "song.h"
-#include "glib_compat.h"
 #include "decoder_list.h"
 #include "decoder_plugin.h"
 
diff --git a/src/update_walk.c b/src/update_walk.c
index 23c5d3e43..615bf41a8 100644
--- a/src/update_walk.c
+++ b/src/update_walk.c
@@ -33,7 +33,6 @@
 #include "mapper.h"
 #include "path.h"
 #include "playlist_list.h"
-#include "glib_compat.h"
 #include "conf.h"
 
 #include <glib.h>
diff --git a/test/test_byte_reverse.c b/test/test_byte_reverse.c
index 7678e9cef..08a107622 100644
--- a/test/test_byte_reverse.c
+++ b/test/test_byte_reverse.c
@@ -18,7 +18,6 @@
  */
 
 #include "util/byte_reverse.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>
 
diff --git a/test/test_glib_compat.h b/test/test_glib_compat.h
deleted file mode 100644
index 2e4ab123c..000000000
--- a/test/test_glib_compat.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * Compatibility header for GLib before 2.16.
- */
-
-#ifndef MPD_TEST_GLIB_COMPAT_H
-#define MPD_TEST_GLIB_COMPAT_H
-
-#include <glib.h>
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-
-#include <string.h>
-
-#define g_assert_cmpint(n1, cmp, n2) g_assert((n1) cmp (n2))
-#define g_assert_cmpstr(a, cmp, b) g_assert(strcmp(a, b) cmp 0)
-
-static void (*test_functions[256])(void);
-static unsigned num_test_functions;
-
-static inline void
-g_test_init(G_GNUC_UNUSED int *argc, G_GNUC_UNUSED char ***argv, ...)
-{
-}
-
-static inline void
-g_test_add_func(G_GNUC_UNUSED const char *testpath, void (test_funcvoid)(void))
-{
-	test_functions[num_test_functions++] = test_funcvoid;
-}
-
-static inline int
-g_test_run(void)
-{
-	for (unsigned i = 0; i < num_test_functions; ++i)
-		test_functions[i]();
-	return 0;
-}
-
-#endif /* !2.16 */
-
-#endif
diff --git a/test/test_pcm_channels.c b/test/test_pcm_channels.c
index 877ae3262..fb3ec5c3e 100644
--- a/test/test_pcm_channels.c
+++ b/test/test_pcm_channels.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 #include "test_pcm_all.h"
-#include "test_glib_compat.h"
 #include "pcm_channels.h"
 #include "pcm_buffer.h"
 
diff --git a/test/test_pcm_dither.c b/test/test_pcm_dither.c
index 24b0dd040..44d105207 100644
--- a/test/test_pcm_dither.c
+++ b/test/test_pcm_dither.c
@@ -18,7 +18,6 @@
  */
 
 #include "test_pcm_all.h"
-#include "test_glib_compat.h"
 #include "pcm_dither.h"
 
 #include <glib.h>
diff --git a/test/test_pcm_main.c b/test/test_pcm_main.c
index 7047b5251..43a849836 100644
--- a/test/test_pcm_main.c
+++ b/test/test_pcm_main.c
@@ -18,7 +18,6 @@
  */
 
 #include "test_pcm_all.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>
 
diff --git a/test/test_pcm_pack.c b/test/test_pcm_pack.c
index de5d8b6e5..5127536fb 100644
--- a/test/test_pcm_pack.c
+++ b/test/test_pcm_pack.c
@@ -19,7 +19,6 @@
 
 #include "test_pcm_all.h"
 #include "pcm_pack.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>