# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209413441 0
# Node ID 01e0ddc7e04018bed9c0e55399e834b70bd115a3
# Parent  8c3f6126759c9e65c0034fed02515d043672e656# Parent  97ecc85b6c188f814dfa06f00767b7d9eac39478
merge of '5f1a220f63d8e85758a94a2ed57381dc91b07eda'
     and 'd367c4b51bfd3fefedc0d0256bbcde2792770344'

diff -r 8c3f6126759c -r 01e0ddc7e040 libpurple/protocols/oscar/family_admin.c
--- 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)
 {
diff -r 8c3f6126759c -r 01e0ddc7e040 libpurple/protocols/oscar/misc.c
--- 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);
 }