Mercurial > pidgin
diff src/protocols/msn/switchboard.c @ 10732:c4cb90065e1d
[gaim-migrate @ 12334]
"gaim_escape_html (according to Ethan) predates
g_markup_escape_text. Current code in Gaim uses both
functions. This patch removes gaim_escape_html from the
API and replaces all calls in the Gaim tree with
g_markup_escape_text. I included a ChangeLog.API note.
As far as I can tell, this still works perfectly.
This is obviously intended for HEAD only, as it removes a
public function." --rlaager
this was discussed extensively this morning
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 26 Mar 2005 02:43:49 +0000 |
| parents | fe919915fceb |
| children | 888d4c328be5 |
line wrap: on
line diff
--- a/src/protocols/msn/switchboard.c Sat Mar 26 01:20:31 2005 +0000 +++ b/src/protocols/msn/switchboard.c Sat Mar 26 02:43:49 2005 +0000 @@ -407,7 +407,7 @@ } body_str = msn_message_to_string(msg); - body_enc = gaim_escape_html(body_str); + body_enc = g_markup_escape_text(body_str, -1); g_free(body_str); format = msn_message_get_attr(msg, "X-MMS-IM-Format"); @@ -640,9 +640,9 @@ account = cmdproc->session->account; if ((b = gaim_find_buddy(account, user)) != NULL) - username = gaim_escape_html(gaim_buddy_get_alias(b)); + username = g_markup_escape_text(gaim_buddy_get_alias(b), -1); else - username = gaim_escape_html(user); + username = g_markup_escape_text(user, -1); str = g_strdup_printf(_("%s has closed the conversation window."), username); @@ -811,7 +811,7 @@ body = msn_message_get_bin_data(msg, &body_len); body_str = g_strndup(body, body_len); - body_enc = gaim_escape_html(body_str); + body_enc = g_markup_escape_text(body_str, -1); g_free(body_str); passport = msg->remote_user;