comparison src/protocols/oscar/oscar.c @ 7235:03f22e564311

[gaim-migrate @ 7810] I added some deps to the rpm, those should be there, right? Also... [ 821937 ] Fix for away message tooltip In Gaim 0.71, the tooltip text for Oscar is not properly escaped. This causes away messages such as "failed <-- this is a fact, not a prediction" to break the tooltip. Other protocols do not have this issue, since they call g_markup_escape_text() in the appropriate places. The call to gaim_markup_strip_html() is not sufficient in cases such as the example, since complete HTML tags are not present but HTML special characters are. This patch simply calls g_markup_escape_text() before adding the away message to the tooltip text. Patch is against the 0.71 source, since I don't think anoymous CVS is up-to-date. --Daniel Westermann-Clark (potpieman) committer: Tailor Script <[e-mail]>

7234:cd0cedf0edd0

	struct oscar_data *od = (struct oscar_data *)gc->proto_data;

	if (od->icq && isdigit(name[0]))
		aim_icq_getallinfo(od->sess, name);
	else
		aim_locate_getinfoshort(od->sess, name, 0x00000007);
}

static void oscar_get_away(GaimConnection *gc, const char *who) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
	if (od->icq) {

				gchar *tmp1, *tmp2;
				const char *tmp3;
				tmp1 = gaim_strreplace(away_utf8, "<BR>", "\n");
				tmp2 = gaim_markup_strip_html(tmp1);
				g_free(tmp1);
				tmp3 = gaim_str_sub_away_formatters(tmp2, gaim_account_get_username(gaim_connection_get_account(gc)));
				g_free(tmp2);
				tmp = ret;
				ret = g_strconcat(tmp, _("<b>Away Message:</b> "), tmp3, "\n", NULL);
				g_free(tmp);
				g_free(away_utf8);
			}

7235:03f22e564311

	struct oscar_data *od = (struct oscar_data *)gc->proto_data;

	if (od->icq && isdigit(name[0]))
		aim_icq_getallinfo(od->sess, name);
	else
		aim_locate_getinfoshort(od->sess, name, 0x00000003);
}

static void oscar_get_away(GaimConnection *gc, const char *who) {
	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
	if (od->icq) {

				gchar *tmp1, *tmp2;
				const char *tmp3;
				tmp1 = gaim_strreplace(away_utf8, "<BR>", "\n");
				tmp2 = gaim_markup_strip_html(tmp1);
				g_free(tmp1);
				tmp1 = g_markup_escape_text(tmp2, strlen(tmp2));
				g_free(tmp2);
				tmp3 = gaim_str_sub_away_formatters(tmp1, gaim_account_get_username(gaim_connection_get_account(gc)));
				g_free(tmp1);
				tmp = ret;
				ret = g_strconcat(tmp, _("<b>Away Message:</b> "), tmp3, "\n", NULL);
				g_free(tmp);
				g_free(away_utf8);
			}