Mercurial > pidgin.yaz
comparison src/protocols/irc/msgs.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 | e84b1ef01905 |
children | bf5e48215158 |
comparison
equal
deleted
inserted
replaced
10731:783ca1f1ebdb | 10732:c4cb90065e1d |
---|---|
303 if (!convo) { | 303 if (!convo) { |
304 gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a topic for %s, which doesn't exist\n", chan); | 304 gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a topic for %s, which doesn't exist\n", chan); |
305 } | 305 } |
306 | 306 |
307 /* If this is an interactive update, print it out */ | 307 /* If this is an interactive update, print it out */ |
308 tmp = gaim_escape_html(topic); | 308 tmp = g_markup_escape_text(topic, -1); |
309 tmp2 = gaim_markup_linkify(tmp); | 309 tmp2 = gaim_markup_linkify(tmp); |
310 g_free(tmp); | 310 g_free(tmp); |
311 if (!strcmp(name, "topic")) { | 311 if (!strcmp(name, "topic")) { |
312 nick = irc_mask_nick(from); | 312 nick = irc_mask_nick(from); |
313 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(convo), nick, topic); | 313 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(convo), nick, topic); |
918 if (!tmp) { | 918 if (!tmp) { |
919 g_free(nick); | 919 g_free(nick); |
920 return; | 920 return; |
921 } | 921 } |
922 | 922 |
923 msg = gaim_escape_html(tmp); | 923 msg = g_markup_escape_text(tmp, -1); |
924 g_free(tmp); | 924 g_free(tmp); |
925 | 925 |
926 tmp = irc_mirc2html(msg); | 926 tmp = irc_mirc2html(msg); |
927 g_free(msg); | 927 g_free(msg); |
928 msg = tmp; | 928 msg = tmp; |