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/rxqueue.c | |
| parent | 875ad4201402b1a8f80ba22a6cdcdb152c6e5510 (diff) | |
| parent | dd345753c1742905c9f81aa71d8b09109fbc5456 (diff) | |
Merge trunk.
Diffstat (limited to 'protocols/oscar/rxqueue.c')
| -rw-r--r-- | protocols/oscar/rxqueue.c | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/protocols/oscar/rxqueue.c b/protocols/oscar/rxqueue.c index 6e8dd29c..34f389af 100644 --- a/protocols/oscar/rxqueue.c +++ b/protocols/oscar/rxqueue.c @@ -391,7 +391,7 @@ int aim_get_command(aim_session_t *sess, aim_conn_t *conn)  		aim_bstream_rewind(&flaphdr);  		start = aimbs_get8(&flaphdr); -		do_error_dialog(sess->aux_data, "FLAP framing disrupted", "Gaim"); +		imcb_error(sess->aux_data, "FLAP framing disrupted");  		aim_conn_close(conn);  		return -1;  	}	 | 
