Mercurial > pidgin
changeset 18688:42d9a1b56d08
merge of '10372c98fc2831d20506d1c4e5b94ce39bbe8d1a'
and 'c3ef8f0109348c89a01e00c3a7eb5d656f0cd448'
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Thu, 12 Jul 2007 02:53:43 +0000 |
| parents | 42939d215988 (current diff) 7fd8bd8594fe (diff) |
| children | c4d1a940aa83 |
| files | libpurple/protocols/bonjour/dns_sd.c libpurple/protocols/bonjour/dns_sd.h libpurple/protocols/qq/group_misc.c libpurple/protocols/qq/group_misc.h libpurple/util.c |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/util.c Thu Jul 12 02:51:30 2007 +0000 +++ b/libpurple/util.c Thu Jul 12 02:53:43 2007 +0000 @@ -1732,11 +1732,10 @@ struct purple_parse_tag *pt = tag->data; if(!pt->ignore) g_string_append_printf(xhtml, "</%s>", pt->dest_tag); + } g_list_free(tags); - } + if(xhtml_out) *xhtml_out = g_strdup(xhtml->str); - if(xhtml_out) - *xhtml_out = g_string_free(xhtml, FALSE); if(plain_out) *plain_out = g_strdup(plain->str); g_string_free(xhtml, TRUE);