# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1209420247 0
# Node ID 99cd68788bc01382257a0333e048645cfc7db029
# Parent  01e0ddc7e04018bed9c0e55399e834b70bd115a3# Parent  5c65b5df9bcc01da90224c4eec3c55c3bc8efa38
merge of '4c5110037671f84e3e775214c32692b5b23c11e1'
     and 'ce267e26db218ed48b76eb6ba6eda0e40cf170c7'

diff -r 5c65b5df9bcc -r 99cd68788bc0 libpurple/protocols/oscar/family_admin.c
--- 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)
 {
diff -r 5c65b5df9bcc -r 99cd68788bc0 libpurple/protocols/oscar/misc.c
--- 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);
 }