diff src/protocols/msn/cmdproc.c @ 9158:c30d81b4dd22

[gaim-migrate @ 9942] Patch from Felipe Contreras to sync our MSN prpl with what's in his tree. He says this may fix a couple bugs, but the important thing is the restructuring of how MsnMessages work. Lots of style changes and other stuff as well. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/cmdproc.c	Tue Jun 01 01:55:55 2004 +0000
+++ b/src/protocols/msn/cmdproc.c	Tue Jun 01 06:42:20 2004 +0000
@@ -120,7 +120,7 @@
 {
 	MsnServConn *servconn;
 	char *data;
-	size_t len;
+	gsize len;
 
 	g_return_if_fail(cmdproc != NULL);
 	g_return_if_fail(trans != NULL);
@@ -129,7 +129,7 @@
 	msn_history_add(cmdproc->history, trans);
 
 	data = msn_transaction_to_string(trans);
-	
+
 	cmdproc->last_trans = g_strdup(data);
 
 	len = strlen(data);
@@ -167,7 +167,8 @@
 
 	servconn = cmdproc->servconn;
 
-	if (format != NULL) {
+	if (format != NULL)
+	{
 		va_start(arg, format);
 		params = g_strdup_vprintf(format, arg);
 		va_end(arg);
@@ -203,7 +204,8 @@
 
 	trans->command = g_strdup(command);
 
-	if (format != NULL) {
+	if (format != NULL)
+	{
 		va_start(arg, format);
 		trans->params = g_strdup_vprintf(format, arg);
 		va_end(arg);
@@ -213,6 +215,16 @@
 }
 
 void
+msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload,
+							int payload_len)
+{
+	g_return_if_fail(cmdproc             != NULL);
+	g_return_if_fail(cmdproc->payload_cb != NULL);
+
+	cmdproc->payload_cb(cmdproc, payload, payload_len);
+}
+
+void
 msn_cmdproc_process_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 {
 	MsnServConn *servconn;
@@ -225,9 +237,8 @@
 
 	if (cb == NULL)
 	{
-		gaim_debug_warning("msn", "Unhandled content-type '%s': %s\n",
-						   msn_message_get_content_type(msg),
-						   msn_message_get_body(msg));
+		gaim_debug_warning("msn", "Unhandled content-type '%s'\n",
+						   msn_message_get_content_type(msg));
 
 		return;
 	}
@@ -236,15 +247,6 @@
 }
 
 void
-msn_cmdproc_process_payload(MsnCmdProc *cmdproc, char *payload, int payload_len)
-{
-	g_return_if_fail(cmdproc             != NULL);
-	g_return_if_fail(cmdproc->payload_cb != NULL);
-
-	cmdproc->payload_cb(cmdproc, payload, payload_len);
-}
-
-void
 msn_cmdproc_process_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	MsnSession *session;
@@ -305,7 +307,7 @@
 	else
 	{
 		gaim_debug_warning("msn", "Unhandled command '%s'\n",
-							cmd->command);
+						   cmd->command);
 
 		return;
 	}