mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk gtk) fix 2.22+ time display regression in the GTK+ client.

This commit is contained in:
Jordan Lee 2011-03-11 04:10:28 +00:00
parent 1aff001fe7
commit e45a6dabc9
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/util.c
View File

@ -183,20 +183,31 @@ tr_strltime( char * buf, int seconds, size_t buflen )
g_snprintf( m, sizeof( m ), gtr_ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
g_snprintf( s, sizeof( s ), gtr_ngettext( "%'d second", "%'d seconds", seconds ), seconds );
if( days >= 4 )
g_strlcpy( buf, d, buflen );
else if( days )
g_snprintf( buf, buflen, "%s, %s", d, h );
else if( hours >= 4 )
g_strlcpy( buf, h, buflen );
if( days )
{
if( days >= 4 || !hours )
g_strlcpy( buf, d, buflen );
else
g_snprintf( buf, buflen, "%s, %s", d, h );
}
else if( hours )
g_snprintf( buf, buflen, "%s, %s", h, m );
else if( minutes >= 4 )
g_strlcpy( buf, m, buflen );
{
if( hours >= 4 || !minutes )
g_strlcpy( buf, h, buflen );
else
g_snprintf( buf, buflen, "%s, %s", h, m );
}
else if( minutes )
g_snprintf( buf, buflen, "%s, %s", m, s );
{
if( minutes >= 4 || !seconds )
g_strlcpy( buf, m, buflen );
else
g_snprintf( buf, buflen, "%s, %s", m, s );
}
else
{
g_strlcpy( buf, s, buflen );
}
return buf;
}