aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/server-client.c b/server-client.c
index 7c879d2b..7b7720e4 100644
--- a/server-client.c
+++ b/server-client.c
@@ -202,7 +202,7 @@ server_client_create(int fd)
c->tty.sx = 80;
c->tty.sy = 24;
- screen_init(&c->status.status, c->tty.sx, 1, 0);
+ status_init(c);
c->message_string = NULL;
TAILQ_INIT(&c->message_log);
@@ -279,13 +279,7 @@ server_client_lost(struct client *c)
if (c->stderr_data != c->stdout_data)
evbuffer_free(c->stderr_data);
- if (event_initialized(&c->status.timer))
- evtimer_del(&c->status.timer);
- screen_free(&c->status.status);
- if (c->status.old_status != NULL) {
- screen_free(c->status.old_status);
- free(c->status.old_status);
- }
+ status_free(c);
free(c->title);
free((void *)c->cwd);
@@ -1547,7 +1541,7 @@ server_client_set_title(struct client *c)
ft = format_create(c, NULL, FORMAT_NONE, 0);
format_defaults(ft, c, NULL, NULL, NULL);
- title = format_expand_time(ft, template, 0);
+ title = format_expand_time(ft, template);
if (c->title == NULL || strcmp(title, c->title) != 0) {
free(c->title);
c->title = xstrdup(title);