Mercurial > pidgin
comparison libpurple/plugins/log_reader.c @ 18360:d8f783ed28d3
Make the Trillian logger set flags properly, and use <br> instead of \n for
newlines. Also, add a comment about \r characters. We should deal with
those at some point.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 30 Jun 2007 21:57:01 +0000 |
| parents | d1e7c8015308 |
| children | c13d115b6c6e |
comparison
equal
deleted
inserted
replaced
| 18359:d1e7c8015308 | 18360:d8f783ed28d3 |
|---|---|
| 1420 char *escaped; | 1420 char *escaped; |
| 1421 GString *formatted; | 1421 GString *formatted; |
| 1422 char *c; | 1422 char *c; |
| 1423 const char *line; | 1423 const char *line; |
| 1424 | 1424 |
| 1425 *flags = PURPLE_LOG_READ_NO_NEWLINE; | |
| 1425 g_return_val_if_fail(log != NULL, g_strdup("")); | 1426 g_return_val_if_fail(log != NULL, g_strdup("")); |
| 1426 | 1427 |
| 1427 data = log->logger_data; | 1428 data = log->logger_data; |
| 1428 | 1429 |
| 1429 g_return_val_if_fail(data->path != NULL, g_strdup("")); | 1430 g_return_val_if_fail(data->path != NULL, g_strdup("")); |
| 1674 g_string_free(temp, TRUE); | 1675 g_string_free(temp, TRUE); |
| 1675 | 1676 |
| 1676 if (footer) | 1677 if (footer) |
| 1677 g_string_append(formatted, footer); | 1678 g_string_append(formatted, footer); |
| 1678 | 1679 |
| 1679 g_string_append_c(formatted, '\n'); | 1680 g_string_append(formatted, "<br>"); |
| 1680 } | 1681 } |
| 1681 | 1682 |
| 1682 g_free(read); | 1683 g_free(read); |
| 1684 | |
| 1685 /* XXX: TODO: What can we do about removing \r characters? | |
| 1686 * XXX: TODO: and will that allow us to avoid this | |
| 1687 * XXX: TODO: g_strchomp(), or is that unrelated? */ | |
| 1683 /* XXX: TODO: Avoid this g_strchomp() */ | 1688 /* XXX: TODO: Avoid this g_strchomp() */ |
| 1684 return g_strchomp(g_string_free(formatted, FALSE)); | 1689 return g_strchomp(g_string_free(formatted, FALSE)); |
| 1685 } | 1690 } |
| 1686 | 1691 |
| 1687 static int trillian_logger_size (PurpleLog *log) | 1692 static int trillian_logger_size (PurpleLog *log) |
