Client: use std::deque for messages

1 files changed, 4 insertions, 9 deletions

diff --git a/src/MessageCommands.cxx b/src/MessageCommands.cxx
index 738c2eab..c5f4d79b 100644
--- a/src/MessageCommands.cxx
+++ b/src/MessageCommands.cxx
@@ -109,19 +109,14 @@ handle_read_messages(Client *client,
 {
 	assert(argc == 1);
 
-	GSList *messages = client_read_messages(client);
-
-	for (GSList *i = messages; i != NULL; i = g_slist_next(i)) {
-		ClientMessage *msg = (ClientMessage *)i->data;
+	while (!client->messages.empty()) {
+		const ClientMessage &msg = client->messages.front();
 
 		client_printf(client, "channel: %s\nmessage: %s\n",
-			      msg->GetChannel(),
-			      msg->GetMessage());
-		delete msg;
+			      msg.GetChannel(), msg.GetMessage());
+		client->messages.pop_front();
 	}
 
-	g_slist_free(messages);
-
 	return COMMAND_RETURN_OK;
 }