sync with sylpheed 0.6.5cvs12
This commit is contained in:
parent
6b0a70743f
commit
67fdec6d4e
5 changed files with 23 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
|||
2001-11-20
|
||||
|
||||
* src/procheader.c: procheader_date_parse(): workaround for
|
||||
RFC-incompliant Date header.
|
||||
|
||||
2001-11-20
|
||||
|
||||
* src/addrbook.c: removed redundant functions, and fixed generation
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2001-11-21 [paul] 0.6.5claws26
|
||||
|
||||
* sync with sylpheed 0.6.5cvs12
|
||||
see 2nd ChangeLog entry dated 2001-11-20
|
||||
|
||||
2001-11-20 [paul] 0.6.5claws25
|
||||
|
||||
* sync with sylpheed 0.6.5cvs11
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2001-11-20
|
||||
|
||||
* src/procheader.c: procheader_date_parse(): RFC 非準拠の Date
|
||||
ヘッダへの対処。
|
||||
|
||||
2001-11-20
|
||||
|
||||
* src/addrbook.c: 余分な関数を削除し、不正なアドレス帳ファイル名
|
||||
|
|
|
@ -8,7 +8,7 @@ MINOR_VERSION=6
|
|||
MICRO_VERSION=5
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=claws25
|
||||
EXTRA_VERSION=claws26
|
||||
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
|
||||
|
||||
dnl
|
||||
|
|
|
@ -688,9 +688,9 @@ gchar *procheader_get_fromname(const gchar *str)
|
|||
time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
|
||||
{
|
||||
static gchar monthstr[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
|
||||
gchar weekday[4];
|
||||
gchar weekday[11];
|
||||
gint day;
|
||||
gchar month[4];
|
||||
gchar month[10];
|
||||
gint year;
|
||||
gint hh, mm, ss;
|
||||
gchar zone[6];
|
||||
|
@ -701,17 +701,17 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
|
|||
time_t timer;
|
||||
|
||||
/* parsing date field... */
|
||||
result = sscanf(src, "%3s, %d %3s %d %2d:%2d:%2d %5s",
|
||||
result = sscanf(src, "%10s %d %9s %d %2d:%2d:%2d %5s",
|
||||
weekday, &day, month, &year, &hh, &mm, &ss, zone);
|
||||
if (result != 8) {
|
||||
result = sscanf(src, "%d %3s %d %2d:%2d:%2d %5s",
|
||||
result = sscanf(src, "%d %9s %d %2d:%2d:%2d %5s",
|
||||
&day, month, &year, &hh, &mm, &ss, zone);
|
||||
if (result != 7) {
|
||||
ss = 0;
|
||||
result = sscanf(src, "%3s, %d %3s %d %2d:%2d %5s",
|
||||
result = sscanf(src, "%10s %d %9s %d %2d:%2d %5s",
|
||||
weekday, &day, month, &year, &hh, &mm, zone);
|
||||
if (result != 7) {
|
||||
result = sscanf(src, "%d %3s %d %2d:%2d %5s",
|
||||
result = sscanf(src, "%d %9s %d %2d:%2d %5s",
|
||||
&day, month, &year, &hh, &mm,
|
||||
zone);
|
||||
if (result != 6) {
|
||||
|
@ -732,6 +732,7 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
|
|||
year += 1900;
|
||||
}
|
||||
|
||||
month[3] = '\0';
|
||||
if ((p = strstr(monthstr, month)) != NULL)
|
||||
dmonth = (gint)(p - monthstr) / 3 + 1;
|
||||
else {
|
||||
|
|
Loading…
Reference in a new issue