Changeset 5c09a59


Ignore:
Timestamp:
2005-11-15T23:16:39Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ef6c6a7
Parents:
9cb9868
Message:

Got rid of raw B's in source,
Replaced most irc_usermsg() calls in nogaim.c with serv_got_crap(),
Slightly clearer handling of buddy add requests.

Thanks to timing for the patch.

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • bitlbee.c

    r9cb9868 r5c09a59  
    518518                }
    519519       
    520         irc_usermsg( irc, "Unknown command: %s. Please use help commands to get a list of available commands.", cmd[0] );
     520        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
    521521       
    522522        return( 1 );
  • commands.c

    r9cb9868 r5c09a59  
    337337        else
    338338        {
    339                 irc_usermsg( irc, "Unknown command: account %s. Please use help commands to get a list of available commands.", cmd[1] );
     339                irc_usermsg( irc, "Unknown command: account %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[1] );
    340340        }
    341341       
     
    738738       
    739739        for( num = 0; q; q = q->next, num ++ )
    740                 irc_usermsg( irc, "%d, %s", num, q->question );
     740                if( q->gc ) /* Not necessary yet, but it might come later */
     741                        irc_usermsg( irc, "%d, %s(%s): %s", num, proto_name[q->gc->protocol], q->gc->username, q->question );
     742                else
     743                        irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
    741744       
    742745        return( 0 );
  • irc.c

    r9cb9868 r5c09a59  
    10691069        irc_spawn( irc, u );
    10701070       
    1071         irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the help command. Lots of FAQ's are answered there." );
     1071        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." );
    10721072       
    10731073        irc->status = USTATUS_LOGGED_IN;
  • protocols/jabber/jabber.c

    r9cb9868 r5c09a59  
    11281128                 */
    11291129                struct jabber_add_permit *jap = g_new0(struct jabber_add_permit, 1);
    1130                 gchar *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."),
     1130                gchar *msg = g_strdup_printf(_("The user %s wants to add you to his/her buddy list."),
    11311131                                Jid);
    11321132
  • protocols/msn/msn_util.c

    r9cb9868 r5c09a59  
    166166       
    167167        g_snprintf( buf, sizeof( buf ),
    168                     "The user %s (%s) wants to add you to his/her buddy list. Do you want to allow this?",
     168                    "The user %s (%s) wants to add you to his/her buddy list.",
    169169                    handle, realname );
    170170        do_ask_dialog( gc, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
  • protocols/nogaim.c

    r9cb9868 r5c09a59  
    122122                        gc->prpl->set_away( gc, s, away );
    123123                        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 );
    125125                }
    126126                else
     
    216216void set_login_progress( struct gaim_connection *gc, int step, char *msg )
    217217{
    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 );
    219219}
    220220
     
    222222void hide_login_progress( struct gaim_connection *gc, char *msg )
    223223{
    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 );
    225225}
    226226
     
    228228void hide_login_progress_error( struct gaim_connection *gc, char *msg )
    229229{
    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 );
    231231}
    232232
     
    276276        u = user_find( gc->irc, gc->irc->nick );
    277277       
    278         irc_usermsg( gc->irc, "%s(%s) - Logged in", proto_name[gc->protocol], gc->username );
     278        serv_got_crap( gc, "Logged in" );
    279279       
    280280        gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
     
    290290               
    291291                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. "
    293293                                              "See \x02""help import_buddies\x02"" for more information." );
    294294        }
     
    323323        account_t *a;
    324324       
    325         irc_usermsg( gc->irc, "%s(%s) - Signing off..", proto_name[gc->protocol], gc->username );
     325        serv_got_crap( gc, "Signing off.." );
    326326
    327327        gaim_input_remove( gc->keepalive );
     
    355355        {
    356356                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 );
    358358               
    359359                a->reconnect = 1;
     
    369369void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
    370370{
    371         irc_usermsg( gc->irc, "%s(%s) - Error: %s", proto_name[gc->protocol], gc->username, msg );
     371        serv_got_crap( gc, "Error: %s", msg );
    372372}
    373373
     
    398398       
    399399        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 );
    401401       
    402402        if( user_findhandle( gc, handle ) )
    403403        {
    404404                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 );
    406406               
    407407                return;
     
    496496               
    497497                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 );
    499499        }
    500500}
     
    529529                        if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
    530530                        {
    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 );
    533533                        }
    534534                       
     
    610610                {
    611611                        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 );
    613613                       
    614614                        return;
     
    632632                else
    633633                {
    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 );
    635635                        u = user_find( irc, irc->mynick );
    636636                }
     
    692692       
    693693        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 );
    695695       
    696696        for( c = gc->conversations; c && c->id != id; c = (l=c)->next );
     
    748748                irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg );
    749749        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 );
    751751}
    752752
     
    776776       
    777777        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 );
    779779       
    780780        return( c );
     
    795795       
    796796        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 );
    798798       
    799799        /* It might be yourself! */
     
    829829       
    830830        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 : "" );
    832832       
    833833        /* It might be yourself! */
  • query.c

    r9cb9868 r5c09a59  
    127127                disp = 1;
    128128        }
    129        
     129        //Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed.
    130130        if( ans )
    131131        {
    132132                q->yes( NULL, q->data );
    133                 irc_usermsg( irc, "Accepted: %s", q->question );
     133                serv_got_crap( q->gc, "\2Accepted\2: %s", q->question );
    134134        }
    135135        else
    136136        {
    137137                q->no( NULL, q->data );
    138                 irc_usermsg( irc, "Rejected: %s", q->question );
     138                serv_got_crap( q->gc, "\2Rejected\2: %s", q->question );
    139139        }
    140140        q->data = NULL;
     
    149149{
    150150        if( q->gc )
    151                 irc_usermsg( irc, "Question on %s connection (handle %s):", proto_name[q->gc->protocol], q->gc->username );
     151        {
     152                serv_got_crap( q->gc, "New request:" );
     153                serv_got_crap( q->gc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question );
     154        }
    152155        else
    153                 irc_usermsg( irc, "Question:" );
    154        
    155         irc_usermsg( irc, "%s\nYou can use the yes/no commands to answer this question.", q->question );
     156        {
     157                irc_usermsg( irc, "New request:" );
     158                irc_usermsg( irc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question );
     159        }
    156160}
    157161
Note: See TracChangeset for help on using the changeset viewer.