diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:22:57 +0200 | 
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 16:22:57 +0200 | 
| commit | 85d7b857fb8ca8e3c03d4abb3368a0966760630c (patch) | |
| tree | a16163e557bcae3af41bde7d2d771d64ca248a97 /protocols/oscar/chat.c | |
| parent | 875ad4201402b1a8f80ba22a6cdcdb152c6e5510 (diff) | |
| parent | dd345753c1742905c9f81aa71d8b09109fbc5456 (diff) | |
Merge trunk.
Diffstat (limited to 'protocols/oscar/chat.c')
| -rw-r--r-- | protocols/oscar/chat.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/protocols/oscar/chat.c b/protocols/oscar/chat.c index df535c4f..fbf45693 100644 --- a/protocols/oscar/chat.c +++ b/protocols/oscar/chat.c @@ -53,7 +53,7 @@ aim_conn_t *aim_chat_getconn(aim_session_t *sess, const char *name)  		if (cur->type != AIM_CONN_TYPE_CHAT)  			continue;  		if (!cur->priv) { -			do_error_dialog(sess->aux_data, "chat connection with no name!", "Gaim"); +			imcb_error(sess->aux_data, "chat connection with no name!");  			continue;  		} @@ -396,7 +396,7 @@ static int infoupdate(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, a  	detaillevel = aimbs_get8(bs);  	if (detaillevel != 0x02) { -		do_error_dialog(sess->aux_data, "Only detaillevel 0x2 is support at the moment", "Gaim"); +		imcb_error(sess->aux_data, "Only detaillevel 0x2 is support at the moment");  		return 1;  	} @@ -614,7 +614,7 @@ static int incomingmsg(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx,  	channel = aimbs_get16(bs);  	if (channel != 0x0003) { -		do_error_dialog(sess->aux_data, "unknown channel!", "Gaim"); +		imcb_error(sess->aux_data, "unknown channel!");  		return 0;  	} | 
