diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-04 22:55:15 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-04 22:55:15 +0100 |
| commit | 019c031a8d77fa8f21792ccf0e07c2dfa058ce5f (patch) | |
| tree | 116b7dc98dc8b4d4805a02f7e5d4ce64c95b9eac /protocols/nogaim.c | |
| parent | 500a1b60d3dd0565d215721e0db7ec7da2dec2e0 (diff) | |
| parent | d636233a518fbe46264230866d4b8ea463f1474e (diff) | |
Merge from Wilmer
Diffstat (limited to 'protocols/nogaim.c')
| -rw-r--r-- | protocols/nogaim.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 7eb0446e..b65ddaf5 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -451,7 +451,14 @@ void signoff( struct gaim_connection *gc ) void do_error_dialog( struct gaim_connection *gc, char *msg, char *title ) { - serv_got_crap( gc, "Error: %s", msg ); + if( msg && title ) + serv_got_crap( gc, "Error: %s: %s", title, msg ); + else if( msg ) + serv_got_crap( gc, "Error: %s", msg ); + else if( title ) + serv_got_crap( gc, "Error: %s", title ); + else + serv_got_crap( gc, "Error" ); } void do_ask_dialog( struct gaim_connection *gc, char *msg, void *data, void *doit, void *dont ) @@ -736,7 +743,7 @@ void serv_got_im( struct gaim_connection *gc, char *handle, char *msg, guint32 f /* If there's a newline/space in this string, split up there, looks a bit prettier. */ - if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strchr( msg, ' ' ) ) ) + if( ( nl = strrchr( msg, '\n' ) ) || ( nl = strrchr( msg, ' ' ) ) ) { msg[425] = tmp; tmp = *nl; @@ -768,7 +775,7 @@ void serv_got_typing( struct gaim_connection *gc, char *handle, int timeout ) return; if( ( u = user_findhandle( gc, handle ) ) ) - irc_msgfrom( gc->irc, u->nick, "\1TYPING 1\1" ); + irc_privmsg( gc->irc, u, "PRIVMSG", gc->irc->nick, NULL, "\1TYPING 1\1" ); } void serv_got_chat_left( struct gaim_connection *gc, int id ) |