pidgin: 278d4bd7: Remove some old code.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 278d4bd73751b544b153817ce49d4ea12f706dd5
Parent:   e2886fb28589e96d33e8377984790990878f27e7
Author:   qulogic at pidgin.im
Date:     12/15/10 16:48:37
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/278d4bd73751b544b153817ce49d4ea12f706dd5

Changelog: 

Remove some old code.

Changes against parent e2886fb28589e96d33e8377984790990878f27e7

  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/switchboard.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/switchboard.c	274e0af6b40167b8b34ff6eaa2a6cc50e20cc6cb
+++ libpurple/protocols/msn/switchboard.c	f28d132cbe3afa91072390f217640c3fe31af14b
@@ -577,33 +577,6 @@ msg_error(MsnCmdProc *cmdproc, MsnTransa
 	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)
 {
============================================================
--- libpurple/protocols/msn/directconn.c	243d41c900e7bf69fe5a56234577b85553a1b3aa
+++ libpurple/protocols/msn/directconn.c	05c36653b8d84730e856ec63c550bab888b6e894
@@ -111,10 +111,6 @@ msn_dc_destroy_packet(MsnDirectConnPacke
 {
 	g_free(p->data);
 
-#if 0
-	if (p->msg)
-		msn_message_unref(p->msg);
-#endif
 	if (p->part)
 		msn_slpmsgpart_unref(p->part);
 
@@ -543,34 +539,7 @@ msn_dc_send_packet_cb(MsnDirectConnPacke
 		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)
 {
 	MsnDirectConnPacket *p;
============================================================
--- libpurple/protocols/msn/directconn.h	e0b198e77f1a07099bca1e6ee10b07a816061ba0
+++ libpurple/protocols/msn/directconn.h	923ada12252e83e6cd10f0f0dac7bb4d557aaddb
@@ -127,11 +127,7 @@ struct _MsnDirectConn
 /*
  * 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);
 
 /*
============================================================
--- libpurple/protocols/msn/contact.c	e2b915e020d185a852a6b70eb7b4b2697c8d124d
+++ libpurple/protocols/msn/contact.c	59977ff977337ad00704a287a241be0ca8fdccdd
@@ -1093,18 +1093,6 @@ msn_add_contact(MsnSession *session, Msn
 	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);