Mercurial > pidgin
comparison src/protocols/gg/gg.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 | 54ac161a876e |
children | 94cc67130789 |
comparison
equal
deleted
inserted
replaced
10731:783ca1f1ebdb | 10732:c4cb90065e1d |
---|---|
1 /* | 1 /* |
2 * gaim - Gadu-Gadu Protocol Plugin | 2 * gaim - Gadu-Gadu Protocol Plugin |
3 * $Id: gg.c 12199 2005-03-07 02:19:09Z deryni9 $ | 3 * $Id: gg.c 12334 2005-03-26 02:43:49Z lschiere $ |
4 * | 4 * |
5 * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> | 5 * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> |
6 * | 6 * |
7 * This program is free software; you can redistribute it and/or modify | 7 * This program is free software; you can redistribute it and/or modify |
8 * it under the terms of the GNU General Public License as published by | 8 * it under the terms of the GNU General Public License as published by |
525 g_snprintf(user, sizeof(user), "%lu", e->event.msg.sender); | 525 g_snprintf(user, sizeof(user), "%lu", e->event.msg.sender); |
526 if (!allowed_uin(gc, user)) | 526 if (!allowed_uin(gc, user)) |
527 break; | 527 break; |
528 imsg = charset_convert(e->event.msg.message, "CP1250", "UTF-8"); | 528 imsg = charset_convert(e->event.msg.message, "CP1250", "UTF-8"); |
529 gaim_str_strip_cr(imsg); | 529 gaim_str_strip_cr(imsg); |
530 jmsg = gaim_escape_html(imsg); | 530 jmsg = g_markup_escape_text(imsg, -1); |
531 serv_got_im(gc, user, jmsg, 0, e->event.msg.time); | 531 serv_got_im(gc, user, jmsg, 0, e->event.msg.time); |
532 g_free(imsg); | 532 g_free(imsg); |
533 g_free(jmsg); | 533 g_free(jmsg); |
534 } | 534 } |
535 break; | 535 break; |