diff libpurple/protocols/msn/directconn.c @ 30767:e5e712cf9f7e

Drop Binary from the struct name.

--- a/libpurple/protocols/msn/directconn.c	Thu Jun 03 21:44:36 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Thu Jun 03 21:50:45 2010 +0000
@@ -340,14 +340,14 @@
 static void
 msn_dc_parse_binary_header(MsnDirectConn *dc)
 {
-	MsnP2PBinaryHeader *h;
-	MsnP2PBinaryHeader *context;
+	MsnP2PHeader *h;
+	MsnP2PHeader *context;
 
 	g_return_if_fail(dc != NULL);
 
 	h = &dc->header;
 	/* Skip packet size */
-	context = (MsnP2PBinaryHeader *)(dc->in_buffer + 4);
+	context = (MsnP2PHeader *)(dc->in_buffer + 4);
 
 	h->session_id = GUINT32_FROM_LE(context->session_id);
 	h->id = GUINT32_FROM_LE(context->id);
@@ -362,8 +362,8 @@
 
 static const gchar *
 msn_dc_serialize_binary_header(MsnDirectConn *dc) {
-	MsnP2PBinaryHeader *h;
-	static MsnP2PBinaryHeader bin_header;
+	MsnP2PHeader *h;
+	static MsnP2PHeader bin_header;
 
 	g_return_val_if_fail(dc != NULL, NULL);
 
@@ -480,7 +480,7 @@
 	h = msn_dc_serialize_binary_header(dc);
 	memcpy(p->data, h, P2P_PACKET_HEADER_SIZE);
 
-	memcpy(p->data + offsetof(MsnP2PBinaryHeader, ack_id), dc->nonce, 16);
+	memcpy(p->data + offsetof(MsnP2PHeader, ack_id), dc->nonce, 16);
 
 	msn_dc_enqueue_packet(dc, p);
 }
@@ -524,7 +524,7 @@
 	if (packet_length != P2P_PACKET_HEADER_SIZE)
 		return FALSE;
 
-	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnP2PBinaryHeader, ack_id), 16);
+	memcpy(nonce, dc->in_buffer + 4 + offsetof(MsnP2PHeader, ack_id), 16);
 
 	if (dc->nonce_type == DC_NONCE_PLAIN) {
 		if (memcmp(dc->nonce, nonce, 16) == 0) {