Commit 3e641e21 authored by Max Kellermann's avatar Max Kellermann

SongSticker: don't use GLib

parent de7e4f0d
...@@ -575,8 +575,6 @@ AC_ARG_ENABLE(sqlite, ...@@ -575,8 +575,6 @@ AC_ARG_ENABLE(sqlite,
AS_HELP_STRING([--enable-sqlite], AS_HELP_STRING([--enable-sqlite],
[enable support for the SQLite database]),, [enable support for the SQLite database]),,
[enable_sqlite=$database_auto]) [enable_sqlite=$database_auto])
MPD_DEPENDS([enable_sqlite], [enable_glib],
[Cannot use --enable-sqlite with --disable-glib])
AC_ARG_ENABLE(systemd-daemon, AC_ARG_ENABLE(systemd-daemon,
AS_HELP_STRING([--enable-systemd-daemon], AS_HELP_STRING([--enable-systemd-daemon],
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
#include "db/LightSong.hxx" #include "db/LightSong.hxx"
#include "db/Interface.hxx" #include "db/Interface.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Alloc.hxx"
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
...@@ -109,7 +108,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name, ...@@ -109,7 +108,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name,
if (*data.base_uri != 0) if (*data.base_uri != 0)
/* append slash to base_uri */ /* append slash to base_uri */
data.base_uri = allocated = data.base_uri = allocated =
g_strconcat(data.base_uri, "/", nullptr); xstrcatdup(data.base_uri, "/");
else else
/* searching in root directory - no trailing slash */ /* searching in root directory - no trailing slash */
allocated = nullptr; allocated = nullptr;
...@@ -118,7 +117,7 @@ sticker_song_find(const Database &db, const char *base_uri, const char *name, ...@@ -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, bool success = sticker_find("song", data.base_uri, name,
sticker_song_find_cb, &data); sticker_song_find_cb, &data);
g_free(allocated); free(allocated);
return success; return success;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment