From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 20 Nov 2001 09:38:22 +0000 (+0000)
Subject: sync with sylpheed 0.6.5cvs11
X-Git-Tag: rel_0_6_6~123
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=abe9ca504abf92f2f0e24dcb415e2da6dbe1a22d

sync with sylpheed 0.6.5cvs11
---

diff --git a/ChangeLog b/ChangeLog
index 6e176f644..966b3300d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
+2001-11-20
+
+	* src/addrbook.c: removed redundant functions, and fixed generation
+	  of spurious address book file names.
+	* src/addrindex.c: V-Card -> vCard.
+
 2001-11-19
 
 	* src/textview.c: get_email_part(): replaced isalnum() with
 	  the macro IS_ASCII_ALNUM() which restricts the range of
 	  characters to 7bit ASCII (thanks to Shimamoto).
+	* src/utils.c: remote_tzoffset_sec(): workaround for malformed
+	  timezone offset.
 
 2001-11-18
 
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1b7133a17..247bf1c16 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2001-11-20 [paul]	0.6.5claws25
+
+	* sync with sylpheed 0.6.5cvs11
+        	see ChangeLog entry 2001-11-19 (src/utils.c)
+
 2001-11-20 [hiro]
 
 	* src/compose.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 694b1a20b..c8c5abfd2 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,8 +1,16 @@
+2001-11-20
+
+	* src/addrbook.c: ;ʬ¤Ê´Ø¿ô¤òºï½ü¤·¡¢ÉÔÀµ¤Ê¥¢¥É¥ì¥¹Ä¢¥Õ¥¡¥¤¥ë̾
+	  ¤¬À¸À®¤µ¤ì¤ë¤Î¤ò½¤Àµ¡£
+	* src/addrindex.c: V-Card -> vCard¡£
+
 2001-11-19
 
 	* src/textview.c: get_email_part(): isalnum() ¤òʸ»ú¤ÎÈϰϤò
 	  7bit ASCII ¤ÎÈϰϤ˲¡¤µ¤¨¤ë¥Þ¥¯¥í IS_ASCII_ALNUM() ¤ÇÃÖ¤­´¹¤¨¤¿
 	  (ÅçËܤµ¤ó thanks)¡£
+	* src/utils.c: remote_tzoffset_sec(): °Û¾ï¤Ê¥¿¥¤¥à¥¾¡¼¥ó¥ª¥Õ¥»¥Ã¥È
+	  ¤Ø¤ÎÂн衣
 
 2001-11-18
 
diff --git a/configure.in b/configure.in
index f72a946a6..e2a3498ee 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws24
+EXTRA_VERSION=claws25
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
diff --git a/src/utils.c b/src/utils.c
index e09be04f7..54b57108b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2027,16 +2027,16 @@ time_t remote_tzoffset_sec(const gchar *zone)
 	gchar *p;
 	gchar c;
 	gint iustz;
-	gint h, m;
+	gint offset;
 	time_t remoteoffset;
 
 	strncpy(zone3, zone, 3);
 	zone3[3] = '\0';
 	remoteoffset = 0;
 
-	if (sscanf(zone, "%c%2d%2d", &c, &h, &m) == 3 &&
+	if (sscanf(zone, "%c%d", &c, &offset) == 2 &&
 	    (c == '+' || c == '-')) {
-		remoteoffset = ((h * 60) + m) * 60;
+		remoteoffset = ((offset / 100) * 60 + (offset % 100)) * 60;
 		if (c == '-')
 			remoteoffset = -remoteoffset;
 	} else if (!strncmp(zone, "UT" , 2) ||