Mercurial > pidgin
diff src/protocols/silc/silc.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 | 82d6760ba000 |
| children | bf5e48215158 |
line wrap: on
line diff
--- a/src/protocols/silc/silc.c Sat Mar 26 01:20:31 2005 +0000 +++ b/src/protocols/silc/silc.c Sat Mar 26 02:43:49 2005 +0000 @@ -744,7 +744,7 @@ return; } - tmp = gaim_escape_html(sg->motd); + tmp = g_markup_escape_text(sg->motd, -1); gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL, tmp, NULL, NULL); g_free(tmp); @@ -1002,7 +1002,7 @@ if (!args || !args[0]) { topic = gaim_conv_chat_get_topic (GAIM_CONV_CHAT(conv)); if (topic) { - tmp = gaim_escape_html(topic); + tmp = g_markup_escape_text(topic, -1); tmp2 = gaim_markup_linkify(tmp); buf = g_strdup_printf(_("current topic is: %s"), tmp2); g_free(tmp); @@ -1144,7 +1144,7 @@ return GAIM_CMD_RET_FAILED; } - tmp = gaim_escape_html(sg->motd); + tmp = g_markup_escape_text(sg->motd, -1); gaim_notify_formatted(gc, NULL, _("Message of the Day"), NULL, tmp, NULL, NULL); g_free(tmp);