# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1212810983 0
# Node ID 1d97298ccff575894818629798a177bd31b5f89e
# Parent  1ac5faa72c8d56c8249b7d5fd111118136ac5037
Fix up some merge errors in MSN's notification.c. Darn meld...

diff -r 1ac5faa72c8d -r 1d97298ccff5 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sat Jun 07 03:10:15 2008 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat Jun 07 03:56:23 2008 +0000
@@ -633,7 +633,7 @@
 {
 	MsnTransaction *trans;
 	purple_debug_info("MSN Notification","Sending ADL with payload: %s\n", payload);
-	trans = msn_transaction_new(cmdproc, "ADL","%" G_GSIZE_FORMAT, payload_len);
+	trans = msn_transaction_new(cmdproc, "ADL", "%i", payload_len);
 	msn_transaction_set_payload(trans, payload, payload_len);
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
@@ -2163,21 +2163,3 @@
 	msn_table_destroy(cbs_table);
 }
 
-	msn_table_add_msg_type(cbs_table,
-						   "text/x-msmsgsemailnotification",
-						   email_msg);
-	/*delete an offline Message notification*/
-	msn_table_add_msg_type(cbs_table,
-							"text/x-msmsgsactivemailnotification",
-						   delete_oim_msg);
-	msn_table_add_msg_type(cbs_table,
-						   "application/x-msmsgssystemmessage",
-						   system_msg);
-}
-
-void
-msn_notification_end(void)
-{
-	msn_table_destroy(cbs_table);
-}
-