From b1264a7416789dad8fad1b4b00a63f99b1ca25e5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 4 Nov 2009 23:29:42 +0000 Subject: Use timeout events for the identify and message timers. --- server-client.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'server-client.c') diff --git a/server-client.c b/server-client.c index 2d5701f5..ec243300 100644 --- a/server-client.c +++ b/server-client.c @@ -120,8 +120,11 @@ server_client_lost(struct client *c) if (c->title != NULL) xfree(c->title); + evtimer_del(&c->identify_timer); + if (c->message_string != NULL) xfree(c->message_string); + evtimer_del(&c->message_timer); if (c->prompt_string != NULL) xfree(c->prompt_string); @@ -448,12 +451,6 @@ server_client_check_timers(struct client *c) if (gettimeofday(&tv, NULL) != 0) fatal("gettimeofday failed"); - if (c->flags & CLIENT_IDENTIFY && timercmp(&tv, &c->identify_timer, >)) - server_clear_identify(c); - - if (c->message_string != NULL && timercmp(&tv, &c->message_timer, >)) - status_message_clear(c); - if (c->message_string != NULL || c->prompt_string != NULL) { /* * Don't need timed redraw for messages/prompts so bail now. -- cgit