diff options
Diffstat (limited to 'irc.c')
| -rw-r--r-- | irc.c | 44 |
1 files changed, 40 insertions, 4 deletions
@@ -51,18 +51,29 @@ static char *set_eval_password( set_t *set, char *value ) static char *set_eval_charset( set_t *set, char *value ) { irc_t *irc = set->data; + char *test; + gsize test_bytes = 0; GIConv ic, oc; if( g_strcasecmp( value, "none" ) == 0 ) value = g_strdup( "utf-8" ); - if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 ) + if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 ) { return NULL; } - if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 ) + if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL || + test_bytes > 1 ) { - g_iconv_close( ic ); + g_free( test ); + g_iconv_close( oc ); + irc_usermsg( irc, "Unsupported character set: The IRC protocol " + "only supports 8-bit character sets." ); + return NULL; + } + if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 ) + { + g_iconv_close( oc ); return NULL; } @@ -77,6 +88,25 @@ static char *set_eval_charset( set_t *set, char *value ) return value; } +static char *set_eval_away_status( set_t *set, char *value ) +{ + irc_t *irc = set->data; + account_t *a; + + g_free( set->value ); + set->value = g_strdup( value ); + + for( a = irc->accounts; a; a = a->next ) + { + struct im_connection *ic = a->ic; + + if( ic && ic->flags & OPT_LOGGED_IN ) + imc_away_send_update( ic ); + } + + return value; +} + irc_t *irc_new( int fd ) { irc_t *irc; @@ -142,13 +172,16 @@ irc_t *irc_new( int fd ) irc_connection_list = g_slist_append( irc_connection_list, irc ); + s = set_add( &irc->set, "away", NULL, set_eval_away_status, irc ); + s->flags |= SET_NULL_OK; s = set_add( &irc->set, "away_devoice", "true", set_eval_away_devoice, irc ); s = set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc ); - s = set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc ); + s = set_add( &irc->set, "auto_reconnect", "true", set_eval_bool, irc ); s = set_add( &irc->set, "auto_reconnect_delay", "5*3<900", set_eval_account_reconnect_delay, irc ); s = set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc ); s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc ); s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc ); + s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc ); s = set_add( &irc->set, "debug", "false", set_eval_bool, irc ); s = set_add( &irc->set, "default_target", "root", NULL, irc ); s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc ); @@ -162,7 +195,10 @@ irc_t *irc_new( int fd ) s = set_add( &irc->set, "root_nick", irc->mynick, set_eval_root_nick, irc ); s = set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc ); s = set_add( &irc->set, "simulate_netsplit", "true", set_eval_bool, irc ); + s = set_add( &irc->set, "status", NULL, set_eval_away_status, irc ); + s->flags |= SET_NULL_OK; s = set_add( &irc->set, "strip_html", "true", NULL, irc ); + s = set_add( &irc->set, "timezone", "local", set_eval_timezone, irc ); s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc ); s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc ); |