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

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.

27562:834236111afc

		jb->resources = g_list_append(jb->resources, jbr);
	}
	jbr->priority = priority;
	jbr->state = state;
	g_free(jbr->status);
	jbr->status = status != NULL ? g_markup_escape_text(status, -1) : NULL;

	return jbr;
}

void jabber_buddy_resource_free(JabberBuddyResource *jbr)

		char *tmp;
		char priority[12];
		const char *status_name = jabber_buddy_state_get_name(jbr->state);

		if (jbr->status) {
			purdy = purple_strdup_withhtml(jbr->status);

			if (purple_strequal(status_name, purdy))
				status_name = NULL;
		}

27563:7a2891487a00

		jb->resources = g_list_append(jb->resources, jbr);
	}
	jbr->priority = priority;
	jbr->state = state;
	g_free(jbr->status);
	jbr->status = g_strdup(status);

	return jbr;
}

void jabber_buddy_resource_free(JabberBuddyResource *jbr)

		char *tmp;
		char priority[12];
		const char *status_name = jabber_buddy_state_get_name(jbr->state);

		if (jbr->status) {
			purdy = g_markup_escape_text(jbr->status, -1);

			if (purple_strequal(status_name, purdy))
				status_name = NULL;
		}