diff options
| -rw-r--r-- | doc/user-guide/commands.xml | 2 | ||||
| -rw-r--r-- | irc.c | 3 | ||||
| -rw-r--r-- | root_commands.c | 14 |
3 files changed, 2 insertions, 17 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 4746e2c3..97c54bae 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -592,7 +592,7 @@ </bitlbee-setting> <bitlbee-setting name="handle_unknown" type="string" scope="global"> - <default>root</default> + <default>add_channel</default> <possible-values>root, add, add_private, add_channel, ignore</possible-values> <description> @@ -99,11 +99,10 @@ irc_t *irc_new( int fd ) s = set_add( &b->set, "away_devoice", "true", NULL/*set_eval_away_devoice*/, irc ); s = set_add( &b->set, "charset", "utf-8", set_eval_charset, irc ); - //s = set_add( &b->set, "control_channel", irc->channel, NULL/*set_eval_control_channel*/, irc ); s = set_add( &b->set, "default_target", "root", NULL, irc ); s = set_add( &b->set, "display_namechanges", "false", set_eval_bool, irc ); s = set_add( &b->set, "display_timestamps", "true", set_eval_bool, irc ); - s = set_add( &b->set, "handle_unknown", "root", NULL, irc ); + s = set_add( &b->set, "handle_unknown", "add_channel", NULL, irc ); s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc ); s = set_add( &b->set, "ops", "both", NULL/*set_eval_ops*/, irc ); s = set_add( &b->set, "paste_buffer", "false", set_eval_bool, irc ); diff --git a/root_commands.c b/root_commands.c index eb42c888..cdc1ccdb 100644 --- a/root_commands.c +++ b/root_commands.c @@ -680,20 +680,6 @@ char *set_eval_root_nick( set_t *set, char *new_nick ) return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID; } - -char *set_eval_control_channel( set_t *set, char *new_name ) -{ - irc_t *irc = set->data; - - if( strcmp( irc->channel, new_name ) != 0 ) - { - char *cmd[] = { "set_rename", irc->channel, new_name, NULL }; - - cmd_rename( irc, cmd ); - } - - return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID; -} #endif static void cmd_block( irc_t *irc, char **cmd ) |