Changes in protocols/nogaim.c [9cb9868:94281ef]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/nogaim.c
r9cb9868 r94281ef 122 122 gc->prpl->set_away( gc, s, away ); 123 123 if( set_getint( gc->irc, "debug" ) ) 124 irc_usermsg( gc->irc, "Setting away state for %s to %s", proto_name[gc->protocol], s );124 serv_got_crap( gc, "Setting away state to %s", s ); 125 125 } 126 126 else … … 216 216 void set_login_progress( struct gaim_connection *gc, int step, char *msg ) 217 217 { 218 irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", proto_name[gc->protocol], gc->username, msg );218 serv_got_crap( gc, "Logging in: %s", msg ); 219 219 } 220 220 … … 222 222 void hide_login_progress( struct gaim_connection *gc, char *msg ) 223 223 { 224 irc_usermsg( gc->irc, "%s(%s) - Login error: %s", proto_name[gc->protocol], gc->username, msg );224 serv_got_crap( gc, "Login error: %s", msg ); 225 225 } 226 226 … … 228 228 void hide_login_progress_error( struct gaim_connection *gc, char *msg ) 229 229 { 230 irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", proto_name[gc->protocol], gc->username, msg );230 serv_got_crap( gc, "Logged out: %s", msg ); 231 231 } 232 232 … … 247 247 msg = text; 248 248 249 /* if( g_strcasecmp( set_getstr(gc->irc, "html" ), "strip" ) == 0 ) */250 if( gc->flags & OPT_CONN_HTML)249 if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) || 250 ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) ) 251 251 strip_html( msg ); 252 252 … … 276 276 u = user_find( gc->irc, gc->irc->nick ); 277 277 278 irc_usermsg( gc->irc, "%s(%s) - Logged in", proto_name[gc->protocol], gc->username);278 serv_got_crap( gc, "Logged in" ); 279 279 280 280 gc->keepalive = g_timeout_add( 60000, send_keepalive, gc ); … … 290 290 291 291 if( u == NULL ) 292 irc_usermsg( gc->irc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "292 serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. " 293 293 "See \x02""help import_buddies\x02"" for more information." ); 294 294 } … … 323 323 account_t *a; 324 324 325 irc_usermsg( gc->irc, "%s(%s) - Signing off..", proto_name[gc->protocol], gc->username);325 serv_got_crap( gc, "Signing off.." ); 326 326 327 327 gaim_input_remove( gc->keepalive ); … … 355 355 { 356 356 int delay = set_getint( irc, "auto_reconnect_delay" ); 357 irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", proto_name[gc->protocol], gc->username, delay);357 serv_got_crap( gc, "Reconnecting in %d seconds..", delay ); 358 358 359 359 a->reconnect = 1; … … 369 369 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title ) 370 370 { 371 irc_usermsg( gc->irc, "%s(%s) - Error: %s", proto_name[gc->protocol], gc->username, msg );371 serv_got_crap( gc, "Error: %s", msg ); 372 372 } 373 373 … … 398 398 399 399 if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */ 400 irc_usermsg( irc, "Receiving user add from protocol: %s", handle );400 serv_got_crap( gc, "Receiving user add from handle: %s", handle ); 401 401 402 402 if( user_findhandle( gc, handle ) ) 403 403 { 404 404 if( set_getint( irc, "debug" ) ) 405 irc_usermsg( irc, "User already exists, ignoring add request: %s", handle );405 serv_got_crap( gc, "User already exists, ignoring add request: %s", handle ); 406 406 407 407 return; … … 496 496 497 497 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) ) 498 irc_usermsg( gc->irc, "User `%s' changed name to `%s'", u->nick, u->realname );498 serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname ); 499 499 } 500 500 } … … 529 529 if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 ) 530 530 { 531 irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );532 irc_usermsg( gc->irc, "loggedin = %d, type = %d", loggedin, type );531 serv_got_crap( gc, "serv_got_update() for handle %s:", handle ); 532 serv_got_crap( gc, "loggedin = %d, type = %d", loggedin, type ); 533 533 } 534 534 … … 610 610 { 611 611 if( set_getint( irc, "debug" ) ) 612 irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, proto_name[gc->protocol], gc->username );612 serv_got_crap( gc, "Ignoring message from unknown handle %s", handle ); 613 613 614 614 return; … … 632 632 else 633 633 { 634 irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );634 serv_got_crap( gc, "Message from unknown handle %s:", handle ); 635 635 u = user_find( irc, irc->mynick ); 636 636 } 637 637 } 638 638 639 /* if( g_strcasecmp( set_getstr( irc, "html" ), "strip" ) == 0 ) */640 if( gc->flags & OPT_CONN_HTML)639 if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) || 640 ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) ) 641 641 strip_html( msg ); 642 642 … … 692 692 693 693 if( set_getint( gc->irc, "debug" ) ) 694 irc_usermsg( gc->irc, "You were removed from conversation %d", (int) id );694 serv_got_crap( gc, "You were removed from conversation %d", (int) id ); 695 695 696 696 for( c = gc->conversations; c && c->id != id; c = (l=c)->next ); … … 737 737 for( c = gc->conversations; c && c->id != id; c = c->next ); 738 738 739 /* if( g_strcasecmp( set_getstr( gc->irc, "html" ), "strip" ) == 0 ) */740 if( gc->flags & OPT_CONN_HTML)739 if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) || 740 ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) ) 741 741 strip_html( msg ); 742 742 … … 748 748 irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg ); 749 749 else 750 irc_usermsg( gc->irc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );750 serv_got_crap( gc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg ); 751 751 } 752 752 … … 771 771 772 772 s = g_new( char, 16 ); 773 sprintf( s, " #chat_%03d", gc->irc->c_id++ );773 sprintf( s, "&chat_%03d", gc->irc->c_id++ ); 774 774 c->channel = g_strdup( s ); 775 775 g_free( s ); 776 776 777 777 if( set_getint( gc->irc, "debug" ) ) 778 irc_usermsg( gc->irc, "Creating new conversation: (id=%d,handle=%s)", id, handle );778 serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle ); 779 779 780 780 return( c ); … … 795 795 796 796 if( set_getint( b->gc->irc, "debug" ) ) 797 irc_usermsg( b->gc->irc, "User %s added to conversation %d", handle, b->id );797 serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id ); 798 798 799 799 /* It might be yourself! */ … … 829 829 830 830 if( set_getint( b->gc->irc, "debug" ) ) 831 irc_usermsg( b->gc->irc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );831 serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" ); 832 832 833 833 /* It might be yourself! */ … … 970 970 msg = buf; 971 971 972 if( u->gc->flags & OPT_CONN_HTML) { 973 char * html = escape_html(msg); 974 strncpy(buf, html, 8192); 975 g_free(html); 972 if( ( u->gc->flags & OPT_CONN_HTML ) && ( g_strncasecmp( msg, "<html>", 6 ) != 0 ) ) 973 { 974 char *html; 975 976 html = escape_html( msg ); 977 strncpy( buf, html, 8192 ); 978 g_free( html ); 979 980 msg = buf; 976 981 } 977 982
Note: See TracChangeset
for help on using the changeset viewer.