[Gaim-commits] CVS: gaim/src util.c,1.325.2.18,1.325.2.19

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20453/src

Modified Files:
      Tag: oldstatus
	util.c 
Log Message:
argh.

:r /tmp/cvsjorQVC

this fixes jabber backlog timestamps for win32, and other platforms without tm_gmtoff


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.325.2.18
retrieving revision 1.325.2.19
diff -u -d -p -r1.325.2.18 -r1.325.2.19
--- util.c	9 Apr 2005 14:12:16 -0000	1.325.2.18
+++ util.c	28 Apr 2005 04:02:10 -0000	1.325.2.19
@@ -552,6 +552,8 @@ gaim_str_to_time(const char *timestamp, 
 					tzoff *= -1;
 			}
 
+			t->tm_isdst = -1;
+
 			if (tzoff || utc) {
 #ifdef HAVE_TM_GMTOFF
 				tzoff += t->tm_gmtoff;
@@ -559,13 +561,13 @@ gaim_str_to_time(const char *timestamp, 
 #	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;