diff libpurple/protocols/msn/state.c @ 20439:bee467c81570

A bunch of MSNP14 stuff: Don't store the group id on the group blist node. Fix & tidy up payload length detection for commands (errors can have payloads too) Avoid a crash when connecting to a new account with no contact list Tidy up addressbook parsing slightly Fix crashes when buddy list sync issues are detected Fix initial email notifications, Fixes #1293 Plug a few memory leaks Detect OIM authentication failures correctly NOTE: I have disabled dynamic address book retrieval, instead we now receive the whole address book. This is because the blist sync stuff is still very wonky.
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 27 May 2007 17:00:06 +0000
parents 5048651671e1
children 530a92d50c5e
line wrap: on
line diff
--- a/libpurple/protocols/msn/state.c	Sun May 27 11:23:09 2007 +0000
+++ b/libpurple/protocols/msn/state.c	Sun May 27 17:00:06 2007 +0000
@@ -89,12 +89,13 @@
 	char *buffer=NULL, *inptr, *outptr, *tmpptr;
 	int length, strings, tmp;
 
-	purple_debug_info("msn", "Parsing currentmedia string: \"%s\"\n", cmedia);
-	if( (cmedia == NULL) || (!strcmp(cmedia, ""))) {
+	if((cmedia == NULL) || (*cmedia == '\0')) {
 		purple_debug_info("msn", "No currentmedia string\n");
 		return NULL;
 	}
 
+	purple_debug_info("msn", "Parsing currentmedia string: \"%s\"\n", cmedia);
+
 	cmedia_array=g_strsplit(cmedia, "\\0", 0);
 
 	strings=1;	/* Skip first empty string */
@@ -231,7 +232,7 @@
 	presence = purple_account_get_presence(account);
 	status = purple_presence_get_active_status(presence);
 	statusline = purple_status_get_attr_string(status, "message");
-	session ->psm = msn_build_psm(statusline, NULL, NULL);
+	session->psm = msn_build_psm(statusline, NULL, NULL);
 	payload = session->psm;
 
 	purple_debug_info("MaYuan","UUX{%s}\n",payload);