Mercurial > pidgin
changeset 20499:7e7add38a02f
merge of '339e17f432d068c87ce9aaa8d19e6f271d1101b1'
and '8d7659804df7d7497ce9bc0b621364d5f132b9f9'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 09 Sep 2007 00:45:05 +0000 |
| parents | 89a82874d64e (diff) 7f5564ebde7f (current diff) |
| children | 403ff626b803 d23c3a5884ee |
| files | libpurple/protocols/msn/oim.c |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;