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.

1 files changed, 3 insertions, 1 deletions

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 )
 	{