cpw.qulogic.msn: 954f3b12: Fix up some merge errors in MSN's notifi...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 954f3b1298946ba4e06f68bc12bf2b48609e2931
Ancestor: aec9d9de161b5636e67e00031713b11470594ad0
Author: qulogic at pidgin.im
Date: 2008-06-07T03:56:23
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/954f3b1298946ba4e06f68bc12bf2b48609e2931

Modified files:
        libpurple/protocols/msn/notification.c

ChangeLog: 

Fix up some merge errors in MSN's notification.c. Darn meld...

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	f5b70826a591ed45050a4b6042869e1c4b627ab9
+++ libpurple/protocols/msn/notification.c	2606cd32fa25542bc6c172de63e89bab407f3c95
@@ -633,7 +633,7 @@ msn_notification_post_adl(MsnCmdProc *cm
 {
 	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_notification_end(void)
 	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);
-}
-