Revision: 16842
Author: rlaager
Date: 2006-08-18 12:13:46 -0700 (Fri, 18 Aug 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16842&view=rev
Log Message:
-----------
Revision #15966:
"Fix the Windows log viewer timestamps-are-off-by-my-GMT-offset bug."
ViewCVS Links:
-------------
http://svn.sourceforge.net/gaim/?rev=15966&view=rev
Modified Paths:
--------------
branches/v2_0_0beta3_1/gaim/src/util.c
Modified: branches/v2_0_0beta3_1/gaim/src/util.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/util.c 2006-08-18 19:11:18 UTC (rev 16841)
+++ branches/v2_0_0beta3_1/gaim/src/util.c 2006-08-18 19:13:46 UTC (rev 16842)
@@ -801,14 +801,20 @@
if (tzoff != GAIM_NO_TZ_OFF || utc)
{
+#if defined(_WIN32)
+ long sys_tzoff;
+#endif
+
#if defined(_WIN32) || defined(HAVE_TM_GMTOFF) || defined (HAVE_TIMEZONE)
if (tzoff == GAIM_NO_TZ_OFF)
tzoff = 0;
#endif
#ifdef _WIN32
- if ((tzoff = win32_get_tz_offset()) == -1)
+ if ((sys_tzoff = win32_get_tz_offset()) == -1)
tzoff = GAIM_NO_TZ_OFF;
+ else
+ tzoff += sys_tzoff;
#else
#ifdef HAVE_TM_GMTOFF
tzoff += t->tm_gmtoff;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
