comparison libpurple/util.c @ 27839:7b8f5dd30a82

propagate from branch 'im.pidgin.pidgin' (head fbc907b599705ebe499000ee228b8be4c456b39b) to branch 'im.pidgin.pidgin.yaz' (head 43e95be75f8daf1a5fbefd025917efbdc2382611)

27838:22f8b5512ef4

			     (sscanf(c, "%02d%02d", &tzhrs, &tzmins) == 2 && (c = c + 4))))
			{
				tzoff = tzhrs*60*60 + tzmins*60;
				if (offset_positive)
					tzoff *= -1;
				/* We don't want the C library doing DST calculations
				 * if we know the UTC offset already. */
				t.tm_isdst = 0;
			}
			else if (utc)
			{
				static struct tm tmptm;
				time_t tmp;

			if (rest != NULL && *c != '\0')
				*rest = c;
		}
	}

	if (tm != NULL)
	{
		*tm = t;
		tm->tm_isdst = -1;
		mktime(tm);
	}

	retval = mktime(&t);
	if (tzoff != PURPLE_NO_TZ_OFF)
		retval += tzoff;

	if (tz_off != NULL)
		*tz_off = tzoff;

27839:7b8f5dd30a82

			     (sscanf(c, "%02d%02d", &tzhrs, &tzmins) == 2 && (c = c + 4))))
			{
				tzoff = tzhrs*60*60 + tzmins*60;
				if (offset_positive)
					tzoff *= -1;
			}
			else if (utc)
			{
				static struct tm tmptm;
				time_t tmp;

			if (rest != NULL && *c != '\0')
				*rest = c;
		}
	}

	retval = mktime(&t);

	if (tm != NULL)
		*tm = t;

	if (tzoff != PURPLE_NO_TZ_OFF)
		retval += tzoff;

	if (tz_off != NULL)
		*tz_off = tzoff;