# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1248819941 0
# Node ID 6d9dc2a2a7970336a532d2a503f7ffa3da63aa9c
# Parent  644f1d6385666b35b44e880575cb0359fa0e499a# Parent  769463505b5c9e97f39e3b65011825d29d14e434
merge of '024d245a8148c47c777a691d387fefdc58337f9c'
     and '4f11d99af7ba7c9e9151d49663a55cb4c7e44fe2'

diff -r 644f1d638566 -r 6d9dc2a2a797 libpurple/ft.c
--- a/libpurple/ft.c	Tue Jul 28 22:08:04 2009 +0000
+++ b/libpurple/ft.c	Tue Jul 28 22:25:41 2009 +0000
@@ -132,6 +132,9 @@
 {
 	g_return_if_fail(xfer != NULL);
 
+	if (xfer->status == status)
+		return;
+
 	xfer->status = status;
 
 	if(xfer->type == PURPLE_XFER_SEND) {
diff -r 644f1d638566 -r 6d9dc2a2a797 pidgin/plugins/themeedit-icon.c
--- a/pidgin/plugins/themeedit-icon.c	Tue Jul 28 22:08:04 2009 +0000
+++ b/pidgin/plugins/themeedit-icon.c	Tue Jul 28 22:25:41 2009 +0000
@@ -73,7 +73,10 @@
 }, chatemblems[] = {
 	{PIDGIN_STOCK_STATUS_IGNORED, N_("Ignored")},
 	{PIDGIN_STOCK_STATUS_FOUNDER, N_("Founder")},
+	/* A user in a chat room who has special privileges. */
 	{PIDGIN_STOCK_STATUS_OPERATOR, N_("Operator")},
+	/* A half operator is someone who has a subset of the privileges
+	   that an operator has. */
 	{PIDGIN_STOCK_STATUS_HALFOP, N_("Half Operator")},
 	{PIDGIN_STOCK_STATUS_VOICE, N_("Voice")},
 	{NULL, NULL}