Mercurial > pidgin
comparison libpurple/util.c @ 18688:42d9a1b56d08
merge of '10372c98fc2831d20506d1c4e5b94ce39bbe8d1a'
and 'c3ef8f0109348c89a01e00c3a7eb5d656f0cd448'
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Thu, 12 Jul 2007 02:53:43 +0000 |
parents | 42939d215988 7fd8bd8594fe |
children | c4d1a940aa83 |
comparison
equal
deleted
inserted
replaced
18687:42939d215988 | 18688:42d9a1b56d08 |
---|---|
1730 if(xhtml) { | 1730 if(xhtml) { |
1731 for (tag = tags; tag ; tag = tag->next) { | 1731 for (tag = tags; tag ; tag = tag->next) { |
1732 struct purple_parse_tag *pt = tag->data; | 1732 struct purple_parse_tag *pt = tag->data; |
1733 if(!pt->ignore) | 1733 if(!pt->ignore) |
1734 g_string_append_printf(xhtml, "</%s>", pt->dest_tag); | 1734 g_string_append_printf(xhtml, "</%s>", pt->dest_tag); |
1735 } | |
1735 g_list_free(tags); | 1736 g_list_free(tags); |
1736 } | 1737 if(xhtml_out) |
1737 *xhtml_out = g_strdup(xhtml->str); | 1738 *xhtml_out = g_strdup(xhtml->str); |
1738 if(xhtml_out) | |
1739 *xhtml_out = g_string_free(xhtml, FALSE); | |
1740 if(plain_out) | 1739 if(plain_out) |
1741 *plain_out = g_strdup(plain->str); | 1740 *plain_out = g_strdup(plain->str); |
1742 g_string_free(xhtml, TRUE); | 1741 g_string_free(xhtml, TRUE); |
1743 g_string_free(plain, TRUE); | 1742 g_string_free(plain, TRUE); |
1744 g_string_free(url, TRUE); | 1743 g_string_free(url, TRUE); |