diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-10-12 01:08:58 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-10-12 01:08:58 +0100 |
| commit | eda54e40d04c83028d84e91c895a550c1929b436 (patch) | |
| tree | 878f985af2ab5d2b9c59e8c955448bc4e9ddec17 /irc.c | |
| parent | 82135c7178b6379f35741991f6c06bb308143194 (diff) | |
| parent | d444c09e6c7ac6fc3c1686af0e63c09805d8cd00 (diff) | |
Merge from devel.
Diffstat (limited to 'irc.c')
| -rw-r--r-- | irc.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -131,7 +131,7 @@ irc_t *irc_new( int fd ) set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc ); set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc ); set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc ); - set_add( &irc->set, "charset", "iso8859-1", set_eval_charset, irc ); + set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc ); set_add( &irc->set, "debug", "false", set_eval_bool, irc ); set_add( &irc->set, "default_target", "root", NULL, irc ); set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc ); @@ -142,6 +142,7 @@ irc_t *irc_new( int fd ) set_add( &irc->set, "private", "true", set_eval_bool, irc ); set_add( &irc->set, "query_order", "lifo", NULL, irc ); set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc ); + set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc ); set_add( &irc->set, "strip_html", "true", NULL, irc ); set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc ); set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc ); @@ -909,7 +910,7 @@ void irc_kill( irc_t *irc, user_t *u ) char *nick, *s; char reason[128]; - if( u->ic && u->ic->flags & OPT_LOGGING_OUT ) + if( u->ic && u->ic->flags & OPT_LOGGING_OUT && set_getbool( &irc->set, "simulate_netsplit" ) ) { if( u->ic->acc->server ) g_snprintf( reason, sizeof( reason ), "%s %s", irc->myhost, |