diff libpurple/util.c @ 27839:7b8f5dd30a82

propagate from branch 'im.pidgin.pidgin' (head fbc907b599705ebe499000ee228b8be4c456b39b) to branch 'im.pidgin.pidgin.yaz' (head 43e95be75f8daf1a5fbefd025917efbdc2382611)

--- a/libpurple/util.c	Sat May 10 12:15:06 2008 +0000
+++ b/libpurple/util.c	Thu May 15 13:29:11 2008 +0000
@@ -831,9 +831,6 @@
 				tzoff = tzhrs*60*60 + tzmins*60;
 				if (offset_positive)
 					tzoff *= -1;
-				/* We don't want the C library doing DST calculations
-				 * if we know the UTC offset already. */
-				t.tm_isdst = 0;
 			}
 			else if (utc)
 			{
@@ -895,14 +892,11 @@
 		}
 	}
 
+	retval = mktime(&t);
+
 	if (tm != NULL)
-	{
 		*tm = t;
-		tm->tm_isdst = -1;
-		mktime(tm);
-	}
-
-	retval = mktime(&t);
+
 	if (tzoff != PURPLE_NO_TZ_OFF)
 		retval += tzoff;