Mercurial > pidgin.yaz
changeset 17818:42a6171a3b25
merge of '8076670c76ed171ce5bc373a596dfd98c5458d91'
and 'dcb937559830ec1750888127573b88946b88c52f'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 10 Jun 2007 17:18:50 +0000 |
| parents | 2c425e60fb1d (diff) 210fc36306e4 (current diff) |
| children | 17f798ec0a2f |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkft.c Sun Jun 10 17:18:43 2007 +0000 +++ b/pidgin/gtkft.c Sun Jun 10 17:18:50 2007 +0000 @@ -248,8 +248,8 @@ get_xfer_info_strings(xfer, &kbsec, &time_elapsed, &time_remaining); - status = g_strdup_printf("%ld%% (%ld of %ld bytes)", - (unsigned long)(purple_xfer_get_progress(xfer)*100), + status = g_strdup_printf("%d%% (%" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes)", + (int)(purple_xfer_get_progress(xfer)*100), (unsigned long)purple_xfer_get_bytes_sent(xfer), (unsigned long)purple_xfer_get_size(xfer));