Changes in irc.c [94d52d64:2ff2076]
Legend:
- Unmodified
- Added
- Removed
-
irc.c
r94d52d64 r2ff2076 28 28 #include "crypting.h" 29 29 #include "ipc.h" 30 #include "dcc.h" 31 32 #include <regex.h> 33 #include <netinet/in.h> 30 34 31 35 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond ); … … 320 324 } 321 325 322 if( ( cs = set_getstr( &irc->set, "charset" ) ) )326 if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) ) 323 327 { 324 328 conv[IRC_MAX_LINE] = 0; 325 if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 ) 326 { 327 if( irc->status & USTATUS_LOGGED_IN ) 328 irc_usermsg( irc, "ERROR: Charset mismatch detected. The charset " 329 "setting is currently set to %s, so please make " 330 "sure your IRC client will send and accept text in " 331 "that charset, or tell BitlBee which charset to " 332 "expect by changing the charset setting. See " 333 "`help set charset' for more information. Your " 334 "message was ignored.", cs ); 335 *conv = 0; 336 } 337 lines[i] = conv; 329 if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 ) 330 lines[i] = conv; 338 331 } 339 332 … … 992 985 return( 1 ); 993 986 } 987 else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 ) 988 { 989 if( u && u->ic && u->ic->acc->prpl->transfer_request ) 990 { 991 file_transfer_t *ft = dcc_request( u->ic, s + 5 ); 992 if ( ft ) 993 u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle ); 994 } 995 return( 1 ); 996 } 994 997 else 995 998 { 996 irc_usermsg( irc, " Non-ACTION CTCP's aren't supported" );999 irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" ); 997 1000 return( 0 ); 998 1001 }
Note: See TracChangeset
for help on using the changeset viewer.