Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/oim.c @ 23534:20da64b2e104
Change msn_oim_parse_timestamp to match purple_str_to_time more
closely. This fixes the OIM timestamp being 2*(TZ offset) hours off,
and hopefully any other timestamp bug like that.
References #5379.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 20 Jun 2008 05:15:49 +0000 |
| parents | 5f9e6f8b2aea |
| children | fd276936164f |
comparison
equal
deleted
inserted
replaced
| 23533:8aa7e01bc4d5 | 23534:20da64b2e104 |
|---|---|
| 478 time_t tzoff = tzhrs * 60 * 60 + tzmins * 60; | 478 time_t tzoff = tzhrs * 60 * 60 + tzmins * 60; |
| 479 #ifdef _WIN32 | 479 #ifdef _WIN32 |
| 480 long sys_tzoff; | 480 long sys_tzoff; |
| 481 #endif | 481 #endif |
| 482 | 482 |
| 483 if (!offset_positive) | 483 if (offset_positive) |
| 484 tzoff *= -1; | 484 tzoff *= -1; |
| 485 | 485 |
| 486 t.tm_year -= 1900; | 486 t.tm_year -= 1900; |
| 487 | 487 |
| 488 #ifdef _WIN32 | 488 #ifdef _WIN32 |
| 489 if ((sys_tzoff = wpurple_get_tz_offset()) != -1) | 489 if ((sys_tzoff = wpurple_get_tz_offset()) != -1) |
| 490 tzoff += sys_tzoff; | 490 tzoff += sys_tzoff; |
| 491 #else | 491 #else |
| 492 #ifdef HAVE_TM_GMTOFF | 492 #ifdef HAVE_TM_GMTOFF |
| 493 tzoff -= t.tm_gmtoff; | 493 tzoff += t.tm_gmtoff; |
| 494 #else | 494 #else |
| 495 # ifdef HAVE_TIMEZONE | 495 # ifdef HAVE_TIMEZONE |
| 496 tzset(); /* making sure */ | 496 tzset(); /* making sure */ |
| 497 tzoff -= timezone; | 497 tzoff -= timezone; |
| 498 # endif | 498 # endif |