# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1189295965 0
# Node ID 89a82874d64ecb1022fe76bcef11785b20a49a24
# Parent  82d8797e06f3d0e614d8ffca510cbd27da197fd3# Parent  c32fbef16656aa7f1b3174193f443ade8380b1b0
merge of '85c73f22a9f7e979b53ff5d0d965a8cba49b35c0'
     and 'b72032dfc24c2067d0692d367120edaa068a1f7c'

diff -r 82d8797e06f3 -r 89a82874d64e libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c	Sat Sep 08 03:34:49 2007 +0000
+++ b/libpurple/protocols/msn/oim.c	Sat Sep 08 23:59:25 2007 +0000
@@ -443,11 +443,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;