comparison src/log.c @ 7462:5fb4cbf1ac54

[gaim-migrate @ 8075] even better...kill it at the source committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sat, 08 Nov 2003 08:49:07 +0000
parents c1ddc403fda4
children f2d82df37252
comparison
equal deleted inserted replaced
7461:c1ddc403fda4 7462:5fb4cbf1ac54
69 } 69 }
70 70
71 char *gaim_log_read(GaimLog *log, GaimLogReadFlags *flags) 71 char *gaim_log_read(GaimLog *log, GaimLogReadFlags *flags)
72 { 72 {
73 g_return_val_if_fail(log && log->logger, NULL); 73 g_return_val_if_fail(log && log->logger, NULL);
74 if (log->logger->read) 74 if (log->logger->read) {
75 return (log->logger->read)(log, flags); 75 char *ret = (log->logger->read)(log, flags);
76 gaim_str_strip_linefeed(ret);
77 return ret;
78 }
76 return (_("<b><font color\"=red\">The logger has no read function</font></b>")); 79 return (_("<b><font color\"=red\">The logger has no read function</font></b>"));
77 } 80 }
78 81
79 /**************************************************************************** 82 /****************************************************************************
80 * LOGGER FUNCTIONS ********************************************************* 83 * LOGGER FUNCTIONS *********************************************************
691 fread(read, data->length, 1, file); 694 fread(read, data->length, 1, file);
692 read[data->length] = '\0'; 695 read[data->length] = '\0';
693 *flags = 0; 696 *flags = 0;
694 if(strstr(read, "<BR>")) 697 if(strstr(read, "<BR>"))
695 *flags |= GAIM_LOG_READ_NO_NEWLINE; 698 *flags |= GAIM_LOG_READ_NO_NEWLINE;
696 gaim_str_strip_linefeed(read);
697 return read; 699 return read;
698 } 700 }
699 701
700 static GaimLogLogger old_logger = { 702 static GaimLogLogger old_logger = {
701 "old logger", "old", 703 "old logger", "old",