comparison src/util.c @ 9424:79c4acbac4cd

[gaim-migrate @ 10242] " gaim_str_seconds_to_string returns an empty string for lengths of time under 1 minute. This leads to some odd-looking tooltips for people who have just logged in, for example. This patch resolves this by providing a nice seconds count for times under 1 minute." --Alan Ford committer: Tailor Script <[e-mail]>

9423:2c6af2767fcf

{
	GString *gstr;
	const char *prefix = "";
	guint days, hrs, mins;

	days = secs / (60 * 60 * 24);
	secs = secs % (60 * 60 * 24);
	hrs  = secs / (60 * 60);
	secs = secs % (60 * 60);
	mins = secs / 60;
	secs = secs % 60;

	gstr = g_string_new("");

	if (days > 0)
	{
		g_string_append_printf(gstr, "%d %s", days,
							   ngettext("day", "days", days));

9424:79c4acbac4cd

{
	GString *gstr;
	const char *prefix = "";
	guint days, hrs, mins;

	gstr = g_string_new("");

	if (secs < 60)
	{
		g_string_append_printf(gstr, "%d %s", secs,
							   ngettext("second", "seconds", secs));
		return g_string_free(gstr, FALSE);
	}

	days = secs / (60 * 60 * 24);
	secs = secs % (60 * 60 * 24);
	hrs  = secs / (60 * 60);
	secs = secs % (60 * 60);
	mins = secs / 60;
	secs = secs % 60;

	if (days > 0)
	{
		g_string_append_printf(gstr, "%d %s", days,
							   ngettext("day", "days", days));