Mercurial > pidgin
comparison src/protocols/irc/cmds.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 | 6239870efd8e |
| children | f43113333717 |
comparison
equal
deleted
inserted
replaced
| 10731:783ca1f1ebdb | 10732:c4cb90065e1d |
|---|---|
| 454 if (!args[0]) { | 454 if (!args[0]) { |
| 455 topic = gaim_conv_chat_get_topic (GAIM_CONV_CHAT(convo)); | 455 topic = gaim_conv_chat_get_topic (GAIM_CONV_CHAT(convo)); |
| 456 | 456 |
| 457 if (topic) { | 457 if (topic) { |
| 458 char *tmp, *tmp2; | 458 char *tmp, *tmp2; |
| 459 tmp = gaim_escape_html(topic); | 459 tmp = g_markup_escape_text(topic, -1); |
| 460 tmp2 = gaim_markup_linkify(tmp); | 460 tmp2 = gaim_markup_linkify(tmp); |
| 461 buf = g_strdup_printf(_("current topic is: %s"), tmp2); | 461 buf = g_strdup_printf(_("current topic is: %s"), tmp2); |
| 462 g_free(tmp); | 462 g_free(tmp); |
| 463 g_free(tmp2); | 463 g_free(tmp2); |
| 464 } else | 464 } else |