# HG changeset patch
# User andrew.victor@mxit.com
# Date 1316978105 0
# Node ID 48bc3f9f2115275704567537dad6aab63b054dce
# Parent  f331cb5325d7c418360919b3231a3b7d95e7121a
purple_xfer_is_canceled() renamed to purple_xfer_is_cancelled()

diff -r f331cb5325d7 -r 48bc3f9f2115 ChangeLog.API
--- a/ChangeLog.API	Sun Sep 25 19:09:01 2011 +0000
+++ b/ChangeLog.API	Sun Sep 25 19:15:05 2011 +0000
@@ -77,6 +77,7 @@
 		  the first parameter
 		* purple_util_fetch_url_request_len renamed to purple_util_fetch_url_request
 		* purple_util_fetch_url_len renamed to purple_util_fetch_url
+		* purple_xfer_is_canceled renamed to purple_xfer_is_cancelled
 		* PurpleConnectionUiOps.report_disconnect now passes a
 		  PurpleConnectionError as the second parameter
 
diff -r f331cb5325d7 -r 48bc3f9f2115 finch/gntft.c
--- a/finch/gntft.c	Sun Sep 25 19:09:01 2011 +0000
+++ b/finch/gntft.c	Sun Sep 25 19:15:05 2011 +0000
@@ -149,7 +149,7 @@
 		while (iter) {
 			PurpleXfer *xfer = iter->data;
 			iter = iter->next;
-			if (purple_xfer_is_completed(xfer) || purple_xfer_is_canceled(xfer))
+			if (purple_xfer_is_completed(xfer) || purple_xfer_is_cancelled(xfer))
 			finch_xfer_dialog_remove_xfer(xfer);
 		}
 	}
@@ -160,7 +160,7 @@
 {
 	PurpleXfer *selected_xfer = gnt_tree_get_selection_data(GNT_TREE(xfer_dialog->tree));
 	if (selected_xfer && (purple_xfer_is_completed(selected_xfer) ||
-				purple_xfer_is_canceled(selected_xfer))) {
+				purple_xfer_is_cancelled(selected_xfer))) {
 		finch_xfer_dialog_remove_xfer(selected_xfer);
 	}
 }
@@ -382,7 +382,7 @@
 
 	update_title_progress();
 
-	if (purple_xfer_is_canceled(xfer))
+	if (purple_xfer_is_cancelled(xfer))
 		status = _("Cancelled");
 	else
 		status = _("Failed");
diff -r f331cb5325d7 -r 48bc3f9f2115 libpurple/ft.c
--- a/libpurple/ft.c	Sun Sep 25 19:09:01 2011 +0000
+++ b/libpurple/ft.c	Sun Sep 25 19:15:05 2011 +0000
@@ -765,9 +765,8 @@
 	return xfer->status;
 }
 
-/* FIXME: Rename with cancelled for 3.0.0. */
 gboolean
-purple_xfer_is_canceled(const PurpleXfer *xfer)
+purple_xfer_is_cancelled(const PurpleXfer *xfer)
 {
 	g_return_val_if_fail(xfer != NULL, TRUE);
 
diff -r f331cb5325d7 -r 48bc3f9f2115 libpurple/ft.h
--- a/libpurple/ft.h	Sun Sep 25 19:09:01 2011 +0000
+++ b/libpurple/ft.h	Sun Sep 25 19:15:05 2011 +0000
@@ -321,9 +321,8 @@
  * @param xfer The file transfer.
  *
  * @return Whether or not the transfer was cancelled.
- * FIXME: This should be renamed using cancelled for 3.0.0.
  */
-gboolean purple_xfer_is_canceled(const PurpleXfer *xfer);
+gboolean purple_xfer_is_cancelled(const PurpleXfer *xfer);
 
 /**
  * Returns the completed state for a file transfer.
diff -r f331cb5325d7 -r 48bc3f9f2115 libpurple/plugins/perl/common/FT.xs
--- a/libpurple/plugins/perl/common/FT.xs	Sun Sep 25 19:09:01 2011 +0000
+++ b/libpurple/plugins/perl/common/FT.xs	Sun Sep 25 19:15:05 2011 +0000
@@ -113,7 +113,7 @@
 	Purple::Xfer xfer
 
 gboolean 
-purple_xfer_is_canceled(xfer)
+purple_xfer_is_cancelled(xfer)
 	Purple::Xfer xfer
 
 gboolean 
diff -r f331cb5325d7 -r 48bc3f9f2115 pidgin/gtkft.c
--- a/pidgin/gtkft.c	Sun Sep 25 19:09:01 2011 +0000
+++ b/pidgin/gtkft.c	Sun Sep 25 19:15:05 2011 +0000
@@ -155,7 +155,7 @@
 		if (purple_xfer_is_completed(xfer)) {
 			*time_remaining = g_strdup(_("Finished"));
 		}
-		else if (purple_xfer_is_canceled(xfer)) {
+		else if (purple_xfer_is_cancelled(xfer)) {
 			*time_remaining = g_strdup(_("Cancelled"));
 		}
 		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
@@ -357,7 +357,7 @@
 #endif
 
 		gtk_widget_set_sensitive(dialog->remove_button, TRUE);
-	} else if (purple_xfer_is_canceled(xfer)) {
+	} else if (purple_xfer_is_cancelled(xfer)) {
 		gtk_widget_hide(dialog->stop_button);
 		gtk_widget_show(dialog->remove_button);
 
@@ -979,7 +979,7 @@
 									PIDGIN_STOCK_FILE_CANCELED,
 									GTK_ICON_SIZE_MENU, NULL);
 
-	if (purple_xfer_is_canceled(xfer))
+	if (purple_xfer_is_cancelled(xfer))
 		status = _("Cancelled");
 	else
 		status = _("Failed");