Mercurial > pidgin
diff libpurple/protocols/oscar/oscar.h @ 23580:e8bea84f63b6
merge of '88c7f87fb5a74f975cf06c472059ecf081c54042'
and 'fe134224188f83f69a5367395922807444d46f49'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Jul 2008 06:33:06 +0000 |
| parents | a73d527731ff 38a30596ff49 |
| children | a270bd4b5298 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.h Sun Jul 20 22:21:27 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Mon Jul 21 06:33:06 2008 +0000 @@ -630,7 +630,7 @@ void flap_connection_send_version(OscarData *od, FlapConnection *conn); void flap_connection_send_version_with_cookie(OscarData *od, FlapConnection *conn, guint16 length, const guint8 *chipsahoy); void flap_connection_send_snac(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data); -void flap_connection_send_snac_with_high_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data, gboolean high_priority); +void flap_connection_send_snac_with_priority(OscarData *od, FlapConnection *conn, guint16 family, const guint16 subtype, guint16 flags, aim_snacid_t snacid, ByteStream *data, gboolean high_priority); void flap_connection_send_keepalive(OscarData *od, FlapConnection *conn); FlapFrame *flap_frame_new(OscarData *od, guint16 channel, int datalen);