Mercurial > pidgin.yaz

diff libpurple/protocols/jabber/buddy.c @ 27563:7a2891487a00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't pre-escape jbr->status. Almost every place required it in unescaped form. The places that did want it escaped had to go through a few hoops just to get it right, which are no longer necessary. Also, some other places failed to take into account that it was escaped, causing other display bugs. Fixes #5352.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 12 Jul 2009 22:40:54 +0000
parents b118127843cc
children a12574d982a1
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c	Sun Jul 12 22:25:44 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun Jul 12 22:40:54 2009 +0000
@@ -168,7 +168,7 @@
 	jbr->priority = priority;
 	jbr->state = state;
 	g_free(jbr->status);
-	jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL;
+	jbr->status = g_strdup(status);
 
 	return jbr;
 }
@@ -702,7 +702,7 @@
 		const char *status_name = jabber_buddy_state_get_name(jbr->state);
 
 		if (jbr->status) {
-			purdy = purple_strdup_withhtml(jbr->status);
+			purdy = g_markup_escape_text(jbr->status, -1);
 
 			if (purple_strequal(status_name, purdy))
 				status_name = NULL;