Mercurial > pidgin
changeset 20497:89a82874d64e
merge of '85c73f22a9f7e979b53ff5d0d965a8cba49b35c0'
and 'b72032dfc24c2067d0692d367120edaa068a1f7c'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 08 Sep 2007 23:59:25 +0000 |
| parents | 82d8797e06f3 (current diff) c32fbef16656 (diff) |
| children | 6ef43e723595 7e7add38a02f |
| files | |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;