aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/lastfm_input_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-10-13 16:12:43 +0200
committerMax Kellermann <max@duempel.org>2009-10-13 16:12:43 +0200
commit4390d72b141304b8dfcdb374b428d3b4fae56237 (patch)
treea7c2132c621c04a1a7494a39b97489900e128539 /src/input/lastfm_input_plugin.c
parent2bf740fc71438edcb2c89e722ee8c83beb560128 (diff)
downloadmpd-4390d72b141304b8dfcdb374b428d3b4fae56237.tar.gz
mpd-4390d72b141304b8dfcdb374b428d3b4fae56237.tar.xz
mpd-4390d72b141304b8dfcdb374b428d3b4fae56237.zip
configure.ac: require GLib 2.16
Accidently, MPD has been using several GLib 2.16 functions for a while, and nobody noticed yet. To simplify the code base, let's bump the minimum GLib version for MPD to 2.16. That version is old enough, and it's reasonable to expect users to have it.
Diffstat (limited to 'src/input/lastfm_input_plugin.c')
-rw-r--r--src/input/lastfm_input_plugin.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/input/lastfm_input_plugin.c b/src/input/lastfm_input_plugin.c
index 4e13cd0ad..fc541ca28 100644
--- a/src/input/lastfm_input_plugin.c
+++ b/src/input/lastfm_input_plugin.c
@@ -55,18 +55,12 @@ lastfm_input_init(const struct config_param *param)
if (passwd == NULL || user == NULL)
return false;
-#if GLIB_CHECK_VERSION(2,16,0)
lastfm_data.user = g_uri_escape_string(user, NULL, false);
-#else
- lastfm_data.user = g_strdup(user);
-#endif
-#if GLIB_CHECK_VERSION(2,16,0)
if (strlen(passwd) != 32)
lastfm_data.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
passwd, strlen(passwd));
else
-#endif
lastfm_data.md5 = g_strdup(passwd);
return true;
@@ -364,23 +358,16 @@ lastfm_input_open(struct input_stream *is, const char *url)
return false;
}
-#if GLIB_CHECK_VERSION(2,16,0)
q = g_uri_escape_string(session, NULL, false);
g_free(session);
session = q;
-#endif
/* "adjust" last.fm radio */
if (strlen(url) > 9) {
char *escaped_url;
-#if GLIB_CHECK_VERSION(2,16,0)
escaped_url = g_uri_escape_string(url, NULL, false);
-#else
- escaped_url = g_strdup(url);
-#endif
-
p = g_strconcat("http://ws.audioscrobbler.com/radio/adjust.php?"
"session=", session, "&url=", escaped_url, "&debug=0",
NULL);