Mercurial > pidgin.yaz
changeset 18700:fd19e7efad68
propagate from branch 'im.pidgin.pidgin' (head 1716933469be8ab48b72ab0259f65b44c4d9b23e)
to branch 'im.pidgin.soc.2007.xmpp' (head 6e59f7f75e6499e2129297cd7633b3cbf848f61a)
| author | Andreas Monitzer <pidgin@monitzer.com> |
|---|---|
| date | Wed, 18 Jul 2007 14:25:25 +0000 |
| parents | 481eb37730bf (diff) 4cfc52d22970 (current diff) |
| children | 97f088385a75 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/log_reader.c Wed Jul 18 14:10:21 2007 +0000 +++ b/libpurple/plugins/log_reader.c Wed Jul 18 14:25:25 2007 +0000 @@ -1919,7 +1919,6 @@ char *c; const char *line; gchar *contents; - char *selected; GError *error; char *utf8_string; FILE *file;
--- a/libpurple/util.c Wed Jul 18 14:10:21 2007 +0000 +++ b/libpurple/util.c Wed Jul 18 14:25:25 2007 +0000 @@ -1740,7 +1740,8 @@ *xhtml_out = g_string_free(xhtml, FALSE); if(plain_out) *plain_out = g_string_free(plain, FALSE); - g_string_free(url, TRUE); + if(url) + g_string_free(url, TRUE); } /* The following are probably reasonable changes: