Mercurial > pidgin
changeset 22755:01e0ddc7e040
merge of '5f1a220f63d8e85758a94a2ed57381dc91b07eda'
and 'd367c4b51bfd3fefedc0d0256bbcde2792770344'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Mon, 28 Apr 2008 20:10:41 +0000 |
| parents | 8c3f6126759c (current diff) 97ecc85b6c18 (diff) |
| children | 17cda378a2dd 99cd68788bc0 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_admin.c Mon Apr 28 06:40:48 2008 +0000 +++ b/libpurple/protocols/oscar/family_admin.c Mon Apr 28 20:10:41 2008 +0000 @@ -120,10 +120,6 @@ * Subtype 0x0004 - Set screenname formatting. * */ -/* - * Subtype 0x0004 - Set screenname formatting. - * - */ int aim_admin_setnick(OscarData *od, FlapConnection *conn, const char *newnick) {
--- a/libpurple/protocols/oscar/misc.c Mon Apr 28 06:40:48 2008 +0000 +++ b/libpurple/protocols/oscar/misc.c Mon Apr 28 20:10:41 2008 +0000 @@ -74,7 +74,7 @@ byte_stream_put32(&bs, *longdata); - flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL); + flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs); byte_stream_destroy(&bs); } @@ -97,7 +97,7 @@ byte_stream_put16(&bs, *shortdata); - flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL); + flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs); byte_stream_destroy(&bs); }