sync with 0.8.10cvs12

diff --git a/ChangeLog b/ChangeLog
index d53ee51be02dca2249bce26f1a4618ec1737f0e0..f05eb693f759ca373c6a6c29e955f8d04bc421bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-17
+
+       * src/procheader.c: procheader_date_parse(): made month string case
+         insensitive.
+       * src/prefs_filter.c: prefs_filter_close(): fixed the crash when the
+         selection list is empty.
+
 2003-02-14
 
        * src/quote_fmt_parse.y: removed gettext translatable strings.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 60c1cee572c045a436ec42b59fd99e752584508f..8812340ba39767354dd8d03eb39618fe233363d1 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-02-17 [paul]      0.8.10claws16
+
+       * sync with 0.8.10cvs12
+               see ChangeLog 2003-02-17
+
 2003-02-16 [match]     0.8.10claws15
 
        * src/addressbook.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 2fc30f68aba6529dae1b1c7e19215cb0c3fb6a3d..760feb2bd40bd9e53fbb0a27b01dc41fc5e6ac01 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,10 @@
+2003-02-17
+
+       * src/procheader.c: procheader_date_parse(): ·î¤Îʸ»úÎó¤òÂ羮ʸ»ú¤ò
+         ¶èÊ̤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+       * src/prefs_filter.c: prefs_filter_close(): ¥»¥ì¥¯¥·¥ç¥ó¥ê¥¹¥È¤¬
+         ¶õ¤Î¾ì¹ç¤Î¥¯¥é¥Ã¥·¥å¤ò½¤Àµ¡£
+
 2003-02-14
 
        * src/quote_fmt_parse.y: gettext ËÝÌõ²Äǽ¤Êʸ»úÎó¤òºï½ü¡£

diff --git a/configure.ac b/configure.ac
index 0de57cf17c391672f8fd8e3e54e8bc78941f6902..4897332bf32f1cad085dee783e01c2bda0211ad2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procheader.c b/src/procheader.c
index ee0fa940faf431e248fc75c6e438f64577bdb00a..a72ac865d45fe63a9333dca9eb7ae6f34ef1d589 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -831,7 +831,7 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
        gint year;
        gint hh, mm, ss;
        gchar zone[6];
-       GDateMonth dmonth;
+       GDateMonth dmonth = G_DATE_BAD_MONTH;
        struct tm t;
        gchar *p;
        time_t timer;
@@ -853,12 +853,14 @@ time_t procheader_date_parse(gchar *dest, const gchar *src, gint len)
        }
 
        month[3] = '\0';
-       if ((p = strstr(monthstr, month)) != NULL)
-               dmonth = (gint)(p - monthstr) / 3 + 1;
-       else {
-               g_warning("Invalid month: %s\n", month);
-               dmonth = G_DATE_BAD_MONTH;
+       for (p = monthstr; *p != '\0'; p += 3) {
+               if (!strncasecmp(p, month, 3)) {
+                       dmonth = (gint)(p - monthstr) / 3 + 1;
+                       break;
+               }
        }
+       if (*p == '\0')
+               g_warning("Invalid month: %s\n", month);
 
        t.tm_sec = ss;
        t.tm_min = mm;