# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1114554469 0
# Node ID 4fdc8a1102c03cde7a34f81061af1f79890f43ed
# Parent  a118e50116df09736dea38591059afd9026282b4
[gaim-migrate @ 12567]
ditto for head

committer: Tailor Script <tailor@pidgin.im>

diff -r a118e50116df -r 4fdc8a1102c0 src/util.c
--- 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;