/pidgin/main: 201a7fd12507: Use "Cancelled" as spelling of stock...

[Elliott Sales de Andrade]

Changeset: 201a7fd1250787cbfa799fac411e4465896ee0f2
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2014-02-09 19:09 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/201a7fd12507

Description:

Use "Cancelled" as spelling of stock item.

This spelling is the one we standardized on everywhere else.

diffstat:

 pidgin/gtkxfer.c     |  2 +-
 pidgin/pidginstock.c |  2 +-
 pidgin/pidginstock.h |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs (36 lines):

diff --git a/pidgin/gtkxfer.c b/pidgin/gtkxfer.c
--- a/pidgin/gtkxfer.c
+++ b/pidgin/gtkxfer.c
@@ -965,7 +965,7 @@ pidgin_xfer_dialog_cancel_xfer(PidginXfe
 	update_title_progress(dialog);
 
 	pixbuf = gtk_widget_render_icon(dialog->window,
-									PIDGIN_STOCK_FILE_CANCELED,
+									PIDGIN_STOCK_FILE_CANCELLED,
 									GTK_ICON_SIZE_MENU, NULL);
 
 	if (purple_xfer_is_cancelled(xfer))
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -57,7 +57,7 @@ static struct StockIcon
 	{ PIDGIN_STOCK_DISCONNECT,      NULL,      GTK_STOCK_DISCONNECT       },
 	{ PIDGIN_STOCK_FGCOLOR,         "buttons", "change-fgcolor-small.png" },
 	{ PIDGIN_STOCK_EDIT,            NULL,      GTK_STOCK_EDIT             },
-	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
+	{ PIDGIN_STOCK_FILE_CANCELLED,  NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
diff --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -46,7 +46,7 @@
 #define PIDGIN_STOCK_DOWNLOAD        "pidgin-download"
 #define PIDGIN_STOCK_EDIT            "pidgin-edit"
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
-#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-cancelled"
+#define PIDGIN_STOCK_FILE_CANCELLED  "pidgin-file-cancelled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INFO            "pidgin-info"