diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-14 02:39:03 +0200 |
| commit | 5cc3338267214eb050e39bc509d8b4258cec6afd (patch) | |
| tree | e513393222f18a5d8d43fec116dac055e1a24d1a /src/playlist | |
| parent | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (diff) | |
| parent | 1ae89728593fce4a40882fa133b9db269015da8f (diff) | |
| download | mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.gz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.tar.xz mpd-5cc3338267214eb050e39bc509d8b4258cec6afd.zip | |
Merge branch 'v0.17.x'
Conflicts:
src/mapper.h
Diffstat (limited to 'src/playlist')
| -rw-r--r-- | src/playlist/lastfm_playlist_plugin.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c index 93768660c..ead14deaa 100644 --- a/src/playlist/lastfm_playlist_plugin.c +++ b/src/playlist/lastfm_playlist_plugin.c @@ -58,12 +58,10 @@ lastfm_init(const struct config_param *param) lastfm_config.user = g_uri_escape_string(user, NULL, false); -#if GLIB_CHECK_VERSION(2,16,0) if (strlen(passwd) != 32) lastfm_config.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5, passwd, strlen(passwd)); else -#endif lastfm_config.md5 = g_strdup(passwd); return true; |