diff libgaim/protocols/msn/command.c @ 20390:d634f88e25d8

msn.tgz from SF Patch #1621854 from Ka-Hing Cheung "This tarball brings soc-2006-msnp13 up to head. In addition to that it also fixes a crash with sending offline messages. I wasn't able to generate a diff against that branch, svn seems to insist on diff'ing against HEAD after I run the merge command. After running `svn merge -r 16309:HEAD https://gaim.svn.sourceforge.net/svnroot/gaim/trunk` on the soc-2006-msnp13 you can replace the msn directory with the attached tarball. The fix for offline messaging is on msn.c:901: if (!session->oim) session->oim = msn_oim_new(session)" committer: Richard Laager <[e-mail]>

--- a/libgaim/protocols/msn/command.c	Sun Apr 15 02:10:37 2007 +0000
+++ b/libgaim/protocols/msn/command.c	Sun Apr 15 02:18:17 2007 +0000
@@ -112,8 +112,6 @@
 	MsnCommand *cmd;
 	char *tmp;
 	char *param_start;
-	char *param;
-	int c;
 
 	g_return_val_if_fail(string != NULL, NULL);
 
@@ -127,6 +125,12 @@
 	{
 		*param_start++ = '\0';
 		cmd->params = g_strsplit(param_start, " ", 0);
+	}
+
+	if (cmd->params != NULL)
+	{
+		char *param;
+		int c;
 
 		for (c = 0; cmd->params[c]; c++);
 		cmd->param_count = c;
@@ -134,10 +138,10 @@
 		param = cmd->params[0];
 
 		cmd->trId = is_num(param) ? atoi(param) : 0;
-	}
-	else
+	}else{
 		cmd->trId = 0;
 	}
+
 	/*add payload Length checking*/
 	msn_set_payload_len(cmd);
 	gaim_debug_info("MaYuan","get payload len:%d\n",cmd->payload_len);