Mercurial > pidgin.yaz

comparison src/protocols/jabber/message.c @ 10732:c4cb90065e1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 bf4c9ce533ab
children d83f745c997b
comparison
equal deleted inserted replaced
10731:783ca1f1ebdb 10732:c4cb90065e1d
170 if(jm->subject) { 170 if(jm->subject) {
171 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource, 171 gaim_conv_chat_set_topic(GAIM_CONV_CHAT(chat->conv), jid->resource,
172 jm->subject); 172 jm->subject);
173 if(!jm->xhtml && !jm->body) { 173 if(!jm->xhtml && !jm->body) {
174 char *msg, *tmp, *tmp2; 174 char *msg, *tmp, *tmp2;
175 tmp = gaim_escape_html(jm->subject); 175 tmp = g_markup_escape_text(jm->subject, -1);
176 tmp2 = gaim_markup_linkify(tmp); 176 tmp2 = gaim_markup_linkify(tmp);
177 if(jid->resource) 177 if(jid->resource)
178 msg = g_strdup_printf(_("%s has set the topic to: %s"), jid->resource, tmp2); 178 msg = g_strdup_printf(_("%s has set the topic to: %s"), jid->resource, tmp2);
179 else 179 else
180 msg = g_strdup_printf(_("The topic is: %s"), tmp2); 180 msg = g_strdup_printf(_("The topic is: %s"), tmp2);