diff libpurple/ft.c @ 30578:0accc8adb18a

merge of '2f6318bd834113559a405ec68cdb178f2180b680' and '64e02b98551e11e093e4649f1516f3aceaa321e2'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 26 Sep 2010 20:16:15 +0000
parents 1cdae196aac8
children 485eaf544bb0
line wrap: on
line diff
--- a/libpurple/ft.c	Sun Sep 26 15:49:16 2010 +0000
+++ b/libpurple/ft.c	Sun Sep 26 20:16:15 2010 +0000
@@ -752,6 +752,7 @@
 	return xfer->status;
 }
 
+/* FIXME: Rename with cancelled for 3.0.0. */
 gboolean
 purple_xfer_is_canceled(const PurpleXfer *xfer)
 {