changeset 10876:4fdc8a1102c0

[gaim-migrate @ 12567] ditto for head committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 26 Apr 2005 22:27:49 +0000
parents a118e50116df
children 99c1fb67b7bb
files src/util.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/util.c	Tue Apr 26 04:35:22 2005 +0000
+++ b/src/util.c	Tue Apr 26 22:27:49 2005 +0000
@@ -553,6 +553,8 @@
 					tzoff *= -1;
 			}
 
+			t->tm_isdst = -1;
+
 			if (tzoff || utc) {
 #ifdef HAVE_TM_GMTOFF
 				tzoff += t->tm_gmtoff;
@@ -560,13 +562,13 @@
 #	ifdef HAVE_TIMEZONE
 				tzset();    /* making sure */
 				tzoff -= timezone;
+				t->tm_isdst = 0; /* I think this might fix it */
 #	endif
 #endif
 			}
 		}
 	}
 
-	t->tm_isdst = -1;
 	retval = mktime(t);
 	retval += tzoff;