Changeset 85d7b85 for protocols/oscar/rxqueue.c

Timestamp:

2008-04-02T14:22:57Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (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 trunk.

File:

• protocols/oscar/rxqueue.c (modified) (1 diff)

protocols/oscar/rxqueue.c

@@ -392 +392 @@
                 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;