Mercurial > pidgin
changeset 18370:95a37af927ff
merge of '9c48f5af550f327eddd36eef116a426804115095'
and 'eb8418512910755aa12d5d497571f2d33bb1b9cf'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 30 Jun 2007 21:57:09 +0000 |
| parents | 73554fed2f1f (current diff) d8f783ed28d3 (diff) |
| children | c13d115b6c6e |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/log_reader.c Sat Jun 30 19:53:13 2007 +0000 +++ b/libpurple/plugins/log_reader.c Sat Jun 30 21:57:09 2007 +0000 @@ -1422,6 +1422,7 @@ char *c; const char *line; + *flags = PURPLE_LOG_READ_NO_NEWLINE; g_return_val_if_fail(log != NULL, g_strdup("")); data = log->logger_data; @@ -1676,10 +1677,14 @@ if (footer) g_string_append(formatted, footer); - g_string_append_c(formatted, '\n'); + g_string_append(formatted, "<br>"); } g_free(read); + + /* XXX: TODO: What can we do about removing \r characters? + * XXX: TODO: and will that allow us to avoid this + * XXX: TODO: g_strchomp(), or is that unrelated? */ /* XXX: TODO: Avoid this g_strchomp() */ return g_strchomp(g_string_free(formatted, FALSE)); }