diff libpurple/protocols/myspace/myspace.c @ 25379:4e8748f3374f

explicit merge of 'cfb115ff00c406f8011c0d661d33bee60813b27c' and '65a6b2bf1ab03c791a4444120e325ce42d9471f2'

--- a/libpurple/protocols/myspace/myspace.c	Fri Jan 02 22:23:19 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Fri Jan 02 22:23:38 2009 +0000
@@ -1387,17 +1387,15 @@
 	if (status_headline && strcmp(status_headline, "") != 0) {
 		/* The status headline is plaintext, but libpurple treats it as HTML,
 		 * so escape any HTML characters to their entity equivalents. */
-		status_headline_escaped = g_markup_escape_text(status_headline, strlen(status_headline));
+		status_headline_escaped = g_markup_escape_text(status_headline, -1);
 	} else {
 		status_headline_escaped = NULL;
 	}
 
 	g_free(status_headline);
 
-	if (user->headline)
-		g_free(user->headline);
-
 	/* don't copy; let the MsimUser own the headline, memory-wise */
+	g_free(user->headline);
 	user->headline = status_headline_escaped;
 
 	/* Set user status */
@@ -1428,7 +1426,6 @@
 					status_code);
 			msim_unrecognized(session, NULL, unrecognized_msg);
 			g_free(unrecognized_msg);
-
 	}
 
 	purple_prpl_got_user_status(session->account, username, purple_primitive_get_id_from_type(purple_status_code), NULL);