diff options
| author | nicm <nicm> | 2014-02-23 00:53:06 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2014-02-23 00:53:06 +0000 |
| commit | f1828921dfed4b7f2ba38b8c4a370b42965c404c (patch) | |
| tree | 0c9c620bbba87432fae1863661d929acde13d3ec /server-client.c | |
| parent | 315d45a0eb596048f2513dab98e4bb47ec1852a4 (diff) | |
| download | rtmux-f1828921dfed4b7f2ba38b8c4a370b42965c404c.tar.gz rtmux-f1828921dfed4b7f2ba38b8c4a370b42965c404c.tar.bz2 rtmux-f1828921dfed4b7f2ba38b8c4a370b42965c404c.zip | |
Change terminal-overrides to a server option (now that we have them), it
doesn't make much sense as a session option.
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index ed8159f5..35df7531 100644 --- a/server-client.c +++ b/server-client.c @@ -114,11 +114,8 @@ server_client_create(int fd) /* Open client terminal if needed. */ int -server_client_open(struct client *c, struct session *s, char **cause) +server_client_open(struct client *c, char **cause) { - struct options *oo = s != NULL ? &s->options : &global_s_options; - char *overrides; - if (c->flags & CLIENT_CONTROL) return (0); @@ -127,8 +124,7 @@ server_client_open(struct client *c, struct session *s, char **cause) return (-1); } - overrides = options_get_string(oo, "terminal-overrides"); - if (tty_open(&c->tty, overrides, cause) != 0) + if (tty_open(&c->tty, cause) != 0) return (-1); return (0); |