Merge branch 'v0.16.x'

Conflicts: NEWS configure.ac
2011-04-12 08:11:33 +02:00
parent 77b6e27500 def2fe8805
commit c2ada39fd3
5 changed files with 16 additions and 4 deletions
--- a/src/command.c
+++ b/src/command.c
@@ -467,7 +467,7 @@ handle_currentsong(struct client *client,
 		   G_GNUC_UNUSED int argc, G_GNUC_UNUSED char *argv[])
 {
 	playlist_print_current(client, &g_playlist);
-	return PLAYLIST_RESULT_SUCCESS;
+	return COMMAND_RETURN_OK;
 }

 static enum command_return