Mercurial > pidgin
diff libpurple/util.h @ 26987:cd78ea46e9bd
merge of '7c614b09b72037ebd86c03fbbeac7794a155547b'
and 'af18689b86389686230fc6ce83cbba52690ce0cb'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 30 May 2009 00:32:50 +0000 |
| parents | ab31daf1c1ee |
| children | f303787f144d |
line wrap: on
line diff
--- a/libpurple/util.h Sat May 30 00:21:37 2009 +0000 +++ b/libpurple/util.h Sat May 30 00:32:50 2009 +0000 @@ -496,7 +496,8 @@ char *purple_markup_linkify(const char *str); /** - * Unescapes HTML entities to their literal characters. + * Unescapes HTML entities to their literal characters. Also translates + * "<br>" to "\n". * For example "&" is replaced by '&' and so on. * Actually only "&", """, "<" and ">" are currently * supported. @@ -505,6 +506,8 @@ * * @return The text with HTML entities literalized. You must g_free * this string when finished with it. + * + * @see purple_escape_html */ char *purple_unescape_html(const char *html);
