===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.634
retrieving revision 1.637
diff -u -r1.634 -r1.637
--- gaim/gaim/src/protocols/oscar/oscar.c	2004/08/05 21:15:41	1.634
+++ gaim/gaim/src/protocols/oscar/oscar.c	2004/08/08 17:15:45	1.637
@@ -3507,8 +3506,18 @@
 
 				if (t) { /* This is an offline message */
 					/* The timestamp is UTC-ish, so we need to get the offset */
+#ifdef HAVE_TM_GMTOFF
+					time_t now;
+					struct tm *tm;
+					now = time(NULL);
+					tm = localtime(&now);
+					t += tm->tm_gmtoff;
+#else
+#	ifdef HAVE_TIMEZONE
 					tzset();
 					t -= timezone;
+#	endif
+#endif
 					serv_got_im(gc, uin, tmp, 0, t);
 				} else { /* This is a message from MacICQ/Miranda */
 					serv_got_im(gc, uin, tmp, 0, time(NULL));