aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/providers/imap/camel-imap-folder.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6433005cc8..c11375dcf1 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * providers/imap/camel-imap-folder.c (decode_internaldate): Use
+ strtol when decoding the timezone (since it can be negative) and
+ don't forget to increment inptr to the start of the time (ie,
+ don't leave inptr pointing to the year when decoding the
+ hour:min:sec).
+
2002-09-30 Jeffrey Stedfast <fejj@ximian.com>
Fixes bug #31456.
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 33494d975c..fda6701693 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -2076,6 +2076,7 @@ decode_internaldate (const unsigned char *in)
tm.tm_year = n - 1900;
+ inptr = buf + 1;
if (!decode_time (&inptr, &hour, &min, &sec))
return (time_t) -1;
@@ -2083,7 +2084,7 @@ decode_internaldate (const unsigned char *in)
tm.tm_min = min;
tm.tm_sec = sec;
- n = strtoul (inptr, NULL, 10);
+ n = strtol (inptr, NULL, 10);
date = e_mktime_utc (&tm);