Mercurial > pidgin.yaz

changeset 23510:1d97298ccff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up some merge errors in MSN's notification.c. Darn meld...
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 07 Jun 2008 03:56:23 +0000
parents 1ac5faa72c8d
children f1345f4338e3
files libpurple/protocols/msn/notification.c
diffstat 1 files changed, 1 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- 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);
-}
-