# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1189298705 0
# Node ID 7e7add38a02f162b1831c4a82b4cf60912676dd7
# Parent  89a82874d64ecb1022fe76bcef11785b20a49a24# Parent  7f5564ebde7f29fe23d1cc932dab8f9ec9268ae9
merge of '339e17f432d068c87ce9aaa8d19e6f271d1101b1'
     and '8d7659804df7d7497ce9bc0b621364d5f132b9f9'

diff -r 7f5564ebde7f -r 7e7add38a02f libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c	Sun Sep 09 00:43:22 2007 +0000
+++ b/libpurple/protocols/msn/oim.c	Sun Sep 09 00:45:05 2007 +0000
@@ -445,11 +445,13 @@
 			if (*tz_str == '-') {
 				offset_positive = FALSE;
 				tz_ptr++;
+			} else if (*tz_str == '+') {
+				tz_ptr++;
 			}
 
 			if (sscanf(tz_ptr, "%02d%02d", &tzhrs, &tzmins) == 2) {
 				t.tm_year -= 1900;
-#if HAVE_TIMEZONE
+#if HAVE_TM_GMTOFF
 				t.tm_gmtoff = tzhrs * 60 * 60 + tzmins * 60;
 				if (!offset_positive)
 					t.tm_gmtoff *= -1;