Mercurial > pidgin
diff libpurple/protocols/jabber/buddy.c @ 27527:a12574d982a1
merge of '6bf1ed8cefd6bb5b980baf7501bcf6936634bd8d'
and 'aff31bc617044d2074a9f5dc1c1b838061c496fd'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 13 Jul 2009 05:40:12 +0000 |
| parents | 95c56191d26c 7a2891487a00 |
| children | 2d541e194416 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c Mon Jul 13 04:11:19 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.c Mon Jul 13 05:40:12 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;