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/chatnav.c | |
| parent | 875ad4201402b1a8f80ba22a6cdcdb152c6e5510 (diff) | |
| parent | dd345753c1742905c9f81aa71d8b09109fbc5456 (diff) | |
Merge trunk.
Diffstat (limited to 'protocols/oscar/chatnav.c')
| -rw-r--r-- | protocols/oscar/chatnav.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/protocols/oscar/chatnav.c b/protocols/oscar/chatnav.c index c7e11765..d94d3c7b 100644 --- a/protocols/oscar/chatnav.c +++ b/protocols/oscar/chatnav.c @@ -285,7 +285,7 @@ static int parseinfo_create(aim_session_t *sess, aim_module_t *mod, aim_frame_t  	tlvlist = aim_readtlvchain(bs);  	if (!(bigblock = aim_gettlv(tlvlist, 0x0004, 1))) { -		do_error_dialog(sess->aux_data, "no bigblock in top tlv in create room response", "Gaim"); +		imcb_error(sess->aux_data, "no bigblock in top tlv in create room response");  		aim_freetlvchain(&tlvlist);  		return 0; @@ -300,7 +300,7 @@ static int parseinfo_create(aim_session_t *sess, aim_module_t *mod, aim_frame_t  	detaillevel = aimbs_get8(&bbbs);  	if (detaillevel != 0x02) { -		do_error_dialog(sess->aux_data, "unknown detaillevel in create room response", "Gaim"); +		imcb_error(sess->aux_data, "unknown detaillevel in create room response");  		aim_freetlvchain(&tlvlist);  		g_free(ck);  		return 0; @@ -366,12 +366,12 @@ static int parseinfo(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, ai  	int ret = 0;  	if (!(snac2 = aim_remsnac(sess, snac->id))) { -		do_error_dialog(sess->aux_data, "received response to unknown request!", "Gaim"); +		imcb_error(sess->aux_data, "received response to unknown request!");  		return 0;  	}  	if (snac2->family != 0x000d) { -		do_error_dialog(sess->aux_data, "recieved response that maps to corrupt request!", "Gaim"); +		imcb_error(sess->aux_data, "recieved response that maps to corrupt request!");  		return 0;  	} @@ -388,7 +388,7 @@ static int parseinfo(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, ai  	else if (snac2->type == 0x0008) /* create room */  		ret = parseinfo_create(sess, mod, rx, snac, bs, snac2);  	else -		do_error_dialog(sess->aux_data, "unknown request subtype", "Gaim"); +		imcb_error(sess->aux_data, "unknown request subtype");  	if (snac2)  		g_free(snac2->data); | 
