From a758ec197f3a01dda26d394c1e5125787e4831b6 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sat, 21 Aug 2010 20:48:41 +0100 Subject: Although the backward compatibility stuff for show_offline and away_devoice was only meant to ease migration, people are now complaining that "set show_offline off" doesn't work. Make this work, but at the same time start hiding these two options to discourage people from using them. --- irc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 4bbaee37..836d5f81 100644 --- a/irc.c +++ b/irc.c @@ -102,6 +102,7 @@ irc_t *irc_new( int fd ) s = set_add( &b->set, "allow_takeover", "true", set_eval_bool, irc ); s = set_add( &b->set, "away_devoice", "true", set_eval_bw_compat, irc ); + s->flags |= SET_HIDDEN; s = set_add( &b->set, "away_reply_timeout", "3600", set_eval_int, irc ); s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc ); s = set_add( &b->set, "default_target", "root", NULL, irc ); @@ -125,6 +126,7 @@ irc_t *irc_new( int fd ) s = set_add( &b->set, "root_nick", ROOT_NICK, set_eval_root_nick, irc ); s->flags |= SET_HIDDEN; s = set_add( &b->set, "show_offline", "false", set_eval_bw_compat, irc ); + s->flags |= SET_HIDDEN; s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc ); s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc ); s = set_add( &b->set, "to_char", ": ", set_eval_to_char, irc ); @@ -917,7 +919,7 @@ static char *set_eval_bw_compat( set_t *set, char *value ) else if( strcmp( set->key, "show_offline" ) == 0 && bool2int( value ) ) val = "online@,away+,offline"; else - return SET_INVALID; + val = "online+,away"; for( l = irc->channels; l; l = l->next ) { -- cgit v1.2.3