pidgin/pidgin

Fix gentoo-819774.
release-2.x.y
2022-01-24, Gary Kramlich
069808ff898f
Parents 930e4fb71321
Children 55b8af79d207
Fix gentoo-819774.

I'm not sure if we needed the code that I duplicated but I really don't want to
rock the board anymore with this function. This causes all unit tests to pass
and everthing seems okay now?

Testing Done:
Ran the unit tests with TZ values of empty, `Asia/Kathmandu` and `Pacific/Auckland`.

Reviewed at https://reviews.imfreedom.org/r/1238/
2 files changed, 18 insertions(+), 2 deletions(-)
  • +7 -2
    libpurple/tests/test_util.c
  • +11 -0
    libpurple/util.c
    • --- a/libpurple/tests/test_util.c Fri Nov 05 03:22:55 2021 -0500
    +++ b/libpurple/tests/test_util.c Mon Jan 24 20:22:15 2022 -0600
    @@ -172,7 +172,7 @@
    fail_unless(1282941722 == purple_str_to_time("2010-08-27.204202", TRUE, NULL, NULL, NULL));
    fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21.3234", TRUE, NULL, NULL, NULL));
    fail_unless(1175919261 == purple_str_to_time("20070407T04:14:21Z", TRUE, NULL, NULL, NULL));
    - fail_unless(1631512800 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
    + fail_unless(1631491200 == purple_str_to_time("09-13-2021", TRUE, NULL, NULL, NULL));
    /* For testing local time we use Asia/Kathmandu because it's +05:45 and
    * doesn't have DST which means the test should always pass regardless of
    @@ -195,9 +195,14 @@
    * localtime.
    */
    timestamp = purple_str_to_time("09/13/202115:34:34", TRUE, NULL, NULL, &rest);
    - fail_unless(1631470500 == timestamp);
    + fail_unless(1631491200 == timestamp);
    assert_string_equal("15:34:34", rest);
    + timestamp = purple_str_to_time("2010-08-27.134202-0700PDT", FALSE, &tm, &tz_off, &rest);
    + fail_unless(1282941722 == timestamp);
    + fail_unless((-7 * 60 * 60) == tz_off);
    + assert_string_equal("PDT", rest);
    +
    /* finally revert the TZ environment variable */
    if(oldtz != NULL) {
    g_setenv("TZ", oldtz, TRUE);
    --- a/libpurple/util.c Fri Nov 05 03:22:55 2021 -0500
    +++ b/libpurple/util.c Mon Jan 24 20:22:15 2022 -0600
    @@ -887,6 +887,17 @@
    t.tm_isdst = -1; /* -1 means dst info is not available */
    }
    }
    + } else {
    + /* If we have a time, figure out if we need to adjust our tz offset. */
    + if(!mktime_with_utc) {
    + if(utc) {
    + mktime_with_utc = TRUE;
    + tzoff = 0;
    + } else {
    + /* Local Time */
    + t.tm_isdst = -1; /* -1 means dst info is not available */
    + }
    + }
    }
    g_free(hours);