1 files changed, 7 insertions, 29 deletions

diff --git a/libpurple/protocols/oscar/misc.c b/libpurple/protocols/oscar/misc.c
index 4ddc562641..ed6b569914 100644
--- a/libpurple/protocols/oscar/misc.c
+++ b/libpurple/protocols/oscar/misc.c
@@ -41,7 +41,7 @@ aim_genericreq_n(OscarData *od, FlapConnection *conn, guint16 family, guint16 su
 {
 	aim_snacid_t snacid = 0x00000000;
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, NULL);
 }
 
 void
@@ -51,7 +51,7 @@ aim_genericreq_n_snacid(OscarData *od, FlapConnection *conn, guint16 family, gui
 
 	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, NULL);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, NULL);
 }
 
 void
@@ -72,30 +72,7 @@ aim_genericreq_l(OscarData *od, FlapConnection *conn, guint16 family, guint16 su
 
 	byte_stream_put32(&bs, *longdata);
 
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs);
-
-	byte_stream_destroy(&bs);
-}
-
-void
-aim_genericreq_s(OscarData *od, FlapConnection *conn, guint16 family, guint16 subtype, guint16 *shortdata)
-{
-	ByteStream bs;
-	aim_snacid_t snacid;
-
-	if (!shortdata)
-	{
-		aim_genericreq_n(od, conn, family, subtype);
-		return;
-	}
-
-	byte_stream_new(&bs, 2);
-
-	snacid = aim_cachesnac(od, family, subtype, 0x0000, NULL, 0);
-
-	byte_stream_put16(&bs, *shortdata);
-
-	flap_connection_send_snac(od, conn, family, subtype, 0x0000, snacid, &bs);
+	flap_connection_send_snac(od, conn, family, subtype, snacid, &bs);
 
 	byte_stream_destroy(&bs);
 }
@@ -114,15 +91,16 @@ generror(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *fram
 
 	snac2 = aim_remsnac(od, snac->id);
 
-	if (byte_stream_empty(bs))
+	if (byte_stream_bytes_left(bs))
 		error = byte_stream_get16(bs);
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame, error, snac2 ? snac2->data : NULL);
 
-	if (snac2)
+	if (snac2) {
 		g_free(snac2->data);
-	g_free(snac2);
+		g_free(snac2);
+	}
 
 	return ret;
 }