# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1181526247 0
# Node ID 4c05f284253bf57af5a5bd03964bfde2e221cbab
# Parent  0e445e906cfdcdc083955366766643fa3c40054a# Parent  6d3d7ee05b064a87951abd77d36fb3a9b4b40ed7
merge of '3205351f2b94e04ee5972a3f2bc1c8218ac95fe6'
     and 'f68bc95ec93e616afdf0527fc982ff5f226f5463'

diff -r 0e445e906cfd -r 4c05f284253b pidgin/gtkft.c
--- a/pidgin/gtkft.c	Mon Jun 11 01:00:27 2007 +0000
+++ b/pidgin/gtkft.c	Mon Jun 11 01:44:07 2007 +0000
@@ -250,8 +250,8 @@
 
 	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));
+							 purple_xfer_get_bytes_sent(xfer),
+							 purple_xfer_get_size(xfer));
 
 	if (purple_xfer_is_completed(xfer)) {