From b62a8e3e3e8be005ccc8be8d157a0fb92d461e31 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 25 Sep 2012 12:04:20 +0200 Subject: command: add COMMAND_RETURN_IDLE Eliminate the hack in handle_idle(). --- src/OtherCommands.cxx | 3 +-- src/client_event.c | 1 + src/command.h | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index 012441fb4..29ddd9962 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -310,6 +310,5 @@ handle_idle(struct client *client, /* enable "idle" mode on this client */ client_idle_wait(client, flags); - /* return value is "1" so the caller won't print "OK" */ - return (enum command_return)1; + return COMMAND_RETURN_IDLE; } diff --git a/src/client_event.c b/src/client_event.c index 4f54ae0a7..dbcd35c44 100644 --- a/src/client_event.c +++ b/src/client_event.c @@ -77,6 +77,7 @@ client_in_event(G_GNUC_UNUSED GIOChannel *source, GIOCondition condition, ret = client_read(client); switch (ret) { case COMMAND_RETURN_OK: + case COMMAND_RETURN_IDLE: case COMMAND_RETURN_ERROR: break; diff --git a/src/command.h b/src/command.h index 6d8a13be1..6ddd22491 100644 --- a/src/command.h +++ b/src/command.h @@ -31,6 +31,12 @@ enum command_return { */ COMMAND_RETURN_OK, + /** + * The connection is now in "idle" mode, and no response shall + * be generated. + */ + COMMAND_RETURN_IDLE, + /** * There was an error. The "ACK" response was sent to the * client. -- cgit v1.2.3