pidgin: 8aee2dc6: purple_xfer_is_canceled() renamed to pur...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: 8aee2dc6d5c2b5f92ffc4827320062298dc5c1c0
Parent:   106592f58365ca74fb7446ca751df08904021b9d
Author:   andrew.victor at mxit.com
Date:     09/25/11 15:15:05
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8aee2dc6d5c2b5f92ffc4827320062298dc5c1c0

Changelog: 

purple_xfer_is_canceled() renamed to purple_xfer_is_cancelled()


Changes against parent 106592f58365ca74fb7446ca751df08904021b9d

  patched  ChangeLog.API
  patched  finch/gntft.c
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/plugins/perl/common/FT.xs
  patched  pidgin/gtkft.c

-------------- next part --------------
============================================================
--- libpurple/ft.c	e2fa9c4656388eda3fe90179dbb4bd15746973fe
+++ libpurple/ft.c	478d518929bf7a380254d2916fde815b78d424c9
@@ -765,9 +765,8 @@ purple_xfer_get_status(const PurpleXfer 
 	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);
 
============================================================
--- libpurple/ft.h	5a83b3faa9ae716af1908b3b7d924fd608a1972b
+++ libpurple/ft.h	37623e2c2b5be65199fa0592761947684f152210
@@ -321,9 +321,8 @@ PurpleXferStatusType purple_xfer_get_sta
  * @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.
============================================================
--- pidgin/gtkft.c	ad9df93d0c3db046c6fb8a4fb5b5eec36b1b33be
+++ pidgin/gtkft.c	03f4c4dfa03504cfcaadc823c5698e17d9efab45
@@ -155,7 +155,7 @@ get_xfer_info_strings(PurpleXfer *xfer, 
 		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 @@ update_buttons(PidginXferDialog *dialog,
 #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_xfer_dialog_cancel_xfer(PidginXfe
 									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");
============================================================
--- ChangeLog.API	c3257567063ffc7e60692bfd6b274a762825da5e
+++ ChangeLog.API	92bfb784539bb51b686534317927a4fa8a33f8c4
@@ -77,6 +77,7 @@ version 3.0.0 (??/??/????):
 		  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
 
============================================================
--- libpurple/plugins/perl/common/FT.xs	9e6ae8f0b81a5fcc618d505f7a24f8855cb32402
+++ libpurple/plugins/perl/common/FT.xs	9511e96eb38934f9f2a4adab68d035f6c7375a72
@@ -113,7 +113,7 @@ gboolean 
 	Purple::Xfer xfer
 
 gboolean 
-purple_xfer_is_canceled(xfer)
+purple_xfer_is_cancelled(xfer)
 	Purple::Xfer xfer
 
 gboolean 
============================================================
--- finch/gntft.c	3554ed7be498289482150c59b358e06e477821b8
+++ finch/gntft.c	8a7d5a0ae86e1044be20a4bbe67ae3848f0d7c87
@@ -149,7 +149,7 @@ toggle_clear_finished_cb(GntWidget *w)
 		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 @@ remove_button_cb(GntButton *button)
 {
 	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 @@ finch_xfer_dialog_cancel_xfer(PurpleXfer
 
 	update_title_progress();
 
-	if (purple_xfer_is_canceled(xfer))
+	if (purple_xfer_is_cancelled(xfer))
 		status = _("Cancelled");
 	else
 		status = _("Failed");