comparison src/protocols/jabber/jabber.c @ 4777:e23a7e166680

[gaim-migrate @ 5097] - a couple compile cleanups - status messages and tooltips won't crash gaim when people put up certain away messages - yahoo status messages will show the current "custom" message instead of the previous one committer: Tailor Script <[e-mail]>

4776:6219ffd18c63

static char *jabber_tooltip_text(struct buddy *b)
{
	jab_res_info jri = jabber_find_resource(b->account->gc, b->name);
	if(jri) {
		char *text = strip_html(jabber_lookup_away(GC_GJ(b->account->gc),
					b->name));
		char *ret = g_strdup_printf(_("<b>Status:</b> %s%s%s"),
				jabber_get_state_string(jri->state), text ? ": " : "",
				text ? text : "");

		if(text)
			g_free(text);
		return ret;
	}
	return NULL;
}

static char *jabber_status_text(struct buddy *b)
{
	if (b->uc & UC_UNAVAILABLE) {
		char *ret = strip_html(jabber_lookup_away(GC_GJ(b->account->gc),
					b->name));
		if(!ret) {
			jab_res_info jri = jabber_find_resource(b->account->gc, b->name);
			if(jri)
				ret = g_strdup(jabber_get_state_string(jri->state));
		}
		return ret;
	}
	return NULL;
}

4777:e23a7e166680

static char *jabber_tooltip_text(struct buddy *b)
{
	jab_res_info jri = jabber_find_resource(b->account->gc, b->name);
	if(jri) {
		char *stripped = strip_html(jabber_lookup_away(GC_GJ(b->account->gc),
					b->name));
		char *text = NULL;
		char *ret;
		if(stripped)
			text = g_markup_escape_text(stripped, strlen(stripped));
		ret = g_strdup_printf(_("<b>Status:</b> %s%s%s"),
				jabber_get_state_string(jri->state), text ? ": " : "",
				text ? text : "");

		if(stripped) {
			g_free(stripped);
			g_free(text);
		}
		return ret;
	}
	return NULL;
}

static char *jabber_status_text(struct buddy *b)
{
	if (b->uc & UC_UNAVAILABLE) {
		char *stripped = strip_html(jabber_lookup_away(GC_GJ(b->account->gc),
					b->name));
		char *ret;
		if(!stripped) {
			jab_res_info jri = jabber_find_resource(b->account->gc, b->name);
			if(jri)
				stripped = g_strdup(jabber_get_state_string(jri->state));
		}
		ret = g_markup_escape_text(stripped, strlen(stripped));
		g_free(stripped);
		return ret;
	}
	return NULL;
}