From 3e641e214734885b01cef2d4abe80d63048c66a2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 24 Oct 2014 20:26:59 +0200
Subject: SongSticker: don't use GLib

---
 configure.ac                | 2 --
 src/sticker/SongSticker.cxx | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0e121e55e..199319974 100644
--- a/configure.ac
+++ b/configure.ac
@@ -575,8 +575,6 @@ AC_ARG_ENABLE(sqlite,
 	AS_HELP_STRING([--enable-sqlite],
 		[enable support for the SQLite database]),,
 	[enable_sqlite=$database_auto])
-MPD_DEPENDS([enable_sqlite], [enable_glib],
-	[Cannot use --enable-sqlite with --disable-glib])
 
 AC_ARG_ENABLE(systemd-daemon,
 	AS_HELP_STRING([--enable-systemd-daemon],
diff --git a/src/sticker/SongSticker.cxx b/src/sticker/SongSticker.cxx
index b6f46f167..c052633b8 100644
--- a/src/sticker/SongSticker.cxx
+++ b/src/sticker/SongSticker.cxx
@@ -23,8 +23,7 @@
 #include "db/LightSong.hxx"
 #include "db/Interface.hxx"
 #include "util/Error.hxx"
-
-#include <glib.h>
+#include "util/Alloc.hxx"
 
 #include <assert.h>
 #include <string.h>
@@ -109,7 +108,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name,
 	if (*data.base_uri != 0)
 		/* append slash to base_uri */
 		data.base_uri = allocated =
-			g_strconcat(data.base_uri, "/", nullptr);
+			xstrcatdup(data.base_uri, "/");
 	else
 		/* searching in root directory - no trailing slash */
 		allocated = nullptr;
@@ -118,7 +117,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name,
 
 	bool success = sticker_find("song", data.base_uri, name,
 				    sticker_song_find_cb, &data);
-	g_free(allocated);
+	free(allocated);
 
 	return success;
 }
-- 
cgit v1.2.3