# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1292449717 0
# Node ID 2f2c45abb3af982d1c14a4a371f04ce22227b4da
# Parent  61db10475bedb12940be2f57e6e2b09805a310db
Remove some old code.

diff -r 61db10475bed -r 2f2c45abb3af libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Wed Dec 15 04:17:59 2010 +0000
+++ b/libpurple/protocols/msn/contact.c	Wed Dec 15 21:48:37 2010 +0000
@@ -1093,18 +1093,6 @@
 	gchar *body = NULL;
 	gchar *contact_xml = NULL;
 
-#if 0
-	gchar *escaped_displayname;
-
-
-	 if (displayname != NULL) {
-		escaped_displayname = g_markup_decode_text(displayname, -1);
-	 } else {
-		escaped_displayname = passport;
-	 }
-	contact_xml = g_strdup_printf(MSN_XML_ADD_CONTACT, escaped_displayname, passport);
-#endif
-
 	purple_debug_info("msn", "Adding contact %s to contact list\n", passport);
 
 	user = msn_userlist_find_user(session->userlist, passport);
diff -r 61db10475bed -r 2f2c45abb3af libpurple/protocols/msn/directconn.c
--- a/libpurple/protocols/msn/directconn.c	Wed Dec 15 04:17:59 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Wed Dec 15 21:48:37 2010 +0000
@@ -111,10 +111,6 @@
 {
 	g_free(p->data);
 
-#if 0
-	if (p->msg)
-		msn_message_unref(p->msg);
-#endif
 	if (p->part)
 		msn_slpmsgpart_unref(p->part);
 
@@ -543,33 +539,6 @@
 		p->part->ack_cb(p->part, p->part->ack_data);
 }
 
-#if 0
-static void
-msn_dc_send_packet_cb(MsnDirectConnPacket *p)
-{
-	if (p->msg != NULL && p->msg->ack_cb != NULL)
-		p->msg->ack_cb(p->msg, p->msg->ack_data);
-}
-
-void
-msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg)
-{
-	MsnDirectConnPacket *p;
-	guint32 length;
-
-	length = msg->body_len + P2P_PACKET_HEADER_SIZE;
-	p = msn_dc_new_packet(length);
-
-	memcpy(p->data, msg->slpmsg->header, P2P_PACKET_HEADER_SIZE);
-	memcpy(p->data + P2P_PACKET_HEADER_SIZE, msg->body, msg->body_len);
-
-	p->sent_cb = msn_dc_send_packet_cb;
-	p->msg = msn_message_ref(msg);
-
-	msn_dc_enqueue_packet(dc, p);
-}
-#endif
-
 void
 msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part)
 {
diff -r 61db10475bed -r 2f2c45abb3af libpurple/protocols/msn/directconn.h
--- a/libpurple/protocols/msn/directconn.h	Wed Dec 15 04:17:59 2010 +0000
+++ b/libpurple/protocols/msn/directconn.h	Wed Dec 15 21:48:37 2010 +0000
@@ -127,10 +127,6 @@
 /*
  * Queues an MSN message to be sent via direct connection.
  */
-#if 0
-void
-msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg);
-#endif
 void
 msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part);
 
diff -r 61db10475bed -r 2f2c45abb3af libpurple/protocols/msn/switchboard.c
--- a/libpurple/protocols/msn/switchboard.c	Wed Dec 15 04:17:59 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Wed Dec 15 21:48:37 2010 +0000
@@ -577,33 +577,6 @@
 	msg_error_helper(cmdproc, trans->data, MSN_MSG_ERROR_UNKNOWN);
 }
 
-#if 0
-/** Called when we receive an ack of a special message. */
-static void
-msg_ack(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-
-	if (msg->ack_cb != NULL)
-		msg->ack_cb(msg->ack_data);
-
-	msn_message_unref(msg);
-}
-
-/** Called when we receive a nak of a special message. */
-static void
-msg_nak(MsnCmdProc *cmdproc, MsnCommand *cmd)
-{
-	MsnMessage *msg;
-
-	msg = cmd->trans->data;
-
-	msn_message_unref(msg);
-}
-#endif
-
 gboolean
 msn_switchboard_can_send(MsnSwitchBoard *swboard)
 {