Mercurial > pidgin.yaz
diff libpurple/log.c @ 30849:6ee64d62c43c
merge of '4216577c2d7814344e8e1face579d153098986ad'
and 'be2c943ad5ecf372a5ba977319b2be4479e34dcc'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sat, 14 Aug 2010 06:24:04 +0000 |
parents | 7c871249318b |
children | 717794d55760 |
line wrap: on
line diff
--- a/libpurple/log.c Sat Aug 14 04:39:07 2010 +0000 +++ b/libpurple/log.c Sat Aug 14 06:24:04 2010 +0000 @@ -1681,7 +1681,6 @@ struct tm tm; char month[4]; struct old_logger_data *data = NULL; - char *newlog; int logfound = 0; int lastoff = 0; int newlen; @@ -1783,7 +1782,7 @@ } while (fgets(buf, BUF_LONG, file)) { - if ((newlog = strstr(buf, "---- New C"))) { + if (strstr(buf, "---- New C") != NULL) { int length; int offset; char convostart[32];