Mercurial > pidgin
changeset 22761:99cd68788bc0
merge of '4c5110037671f84e3e775214c32692b5b23c11e1'
and 'ce267e26db218ed48b76eb6ba6eda0e40cf170c7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 28 Apr 2008 22:04:07 +0000 |
| parents | 01e0ddc7e040 (diff) 5c65b5df9bcc (current diff) |
| children | 20053e2484f8 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_admin.c Mon Apr 28 19:24:18 2008 +0000 +++ b/libpurple/protocols/oscar/family_admin.c Mon Apr 28 22:04:07 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 19:24:18 2008 +0000 +++ b/libpurple/protocols/oscar/misc.c Mon Apr 28 22:04:07 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); }