From 5155b0f6087b5929838f6594a719011e3e704244 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Jan 2013 17:58:22 +0100 Subject: ClientMessage: turn into a class --- src/ClientSubscribe.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ClientSubscribe.cxx') diff --git a/src/ClientSubscribe.cxx b/src/ClientSubscribe.cxx index 3f4714958..4f1471474 100644 --- a/src/ClientSubscribe.cxx +++ b/src/ClientSubscribe.cxx @@ -25,6 +25,7 @@ extern "C" { #include "idle.h" } +#include #include enum client_subscribe_result @@ -78,21 +79,19 @@ client_unsubscribe_all(Client *client) } bool -client_push_message(Client *client, const struct client_message *msg) +client_push_message(Client *client, const ClientMessage &msg) { assert(client != NULL); - assert(msg != NULL); - assert(client_message_defined(msg)); if (client->num_messages >= CLIENT_MAX_MESSAGES || - !client->IsSubscribed(msg->channel)) + !client->IsSubscribed(msg.GetChannel())) return false; if (client->messages == NULL) client_idle_add(client, IDLE_MESSAGE); client->messages = g_slist_prepend(client->messages, - client_message_dup(msg)); + new ClientMessage(msg)); ++client->num_messages; return true; -- cgit v1.2.3