Changeset 019c031 for protocols/nogaim.c


Ignore:
Timestamp:
2005-12-04T21:55:15Z (16 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
568aaf7
Parents:
500a1b6 (diff), d636233 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from Wilmer

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/nogaim.c

    r500a1b6 r019c031  
    452452void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
    453453{
    454         serv_got_crap( gc, "Error: %s", msg );
     454        if( msg && title )
     455                serv_got_crap( gc, "Error: %s: %s", title, msg );
     456        else if( msg )
     457                serv_got_crap( gc, "Error: %s", msg );
     458        else if( title )
     459                serv_got_crap( gc, "Error: %s", title );
     460        else
     461                serv_got_crap( gc, "Error" );
    455462}
    456463
     
    737744                /* If there's a newline/space in this string, split up there,
    738745                   looks a bit prettier. */
    739                 if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) )
     746                if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) )
    740747                {
    741748                        msg[425] = tmp;
     
    769776       
    770777        if( ( u = user_findhandle( gc, handle ) ) )
    771                 irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" );
     778                irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" );
    772779}
    773780
Note: See TracChangeset for help on using the changeset viewer.