# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1274058073 0
# Node ID 815bd8b41638eb97ba2260552b98367a0ea4c53e
# Parent  3057fd96be81db882dce374ee064b8f81422baec
I before E, except after C

diff -r 3057fd96be81 -r 815bd8b41638 libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Mon May 17 00:18:25 2010 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Mon May 17 01:01:13 2010 +0000
@@ -386,7 +386,7 @@
 	BonjourBuddy *bb = NULL;
 	const gchar *name = bconv->pb ? purple_buddy_get_name(bconv->pb) : "(unknown)";
 
-	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", name);
+	purple_debug_info("bonjour", "Received conversation close notification from %s.\n", name);
 
 	if(bconv->pb != NULL)
 		bb = purple_buddy_get_protocol_data(bconv->pb);
@@ -582,7 +582,7 @@
 }
 
 /* This gets called when we've successfully sent our <stream:stream />
- * AND when we've recieved a <stream:stream /> */
+ * AND when we've received a <stream:stream /> */
 void bonjour_jabber_stream_started(BonjourJabberConversation *bconv) {
 
 	if (bconv->sent_stream_start == NOT_SENT && !bonjour_jabber_send_stream_init(bconv, bconv->socket)) {
diff -r 3057fd96be81 -r 815bd8b41638 libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c	Mon May 17 00:18:25 2010 +0000
+++ b/libpurple/protocols/irc/msgs.c	Mon May 17 01:01:13 2010 +0000
@@ -851,7 +851,7 @@
 	}
 
 	if (!convo) {
-		purple_debug(PURPLE_DEBUG_ERROR, "irc", "Recieved a KICK for unknown channel %s\n", args[0]);
+		purple_debug(PURPLE_DEBUG_ERROR, "irc", "Received a KICK for unknown channel %s\n", args[0]);
 		g_free(nick);
 		return;
 	}
diff -r 3057fd96be81 -r 815bd8b41638 libpurple/protocols/mxit/chunk.h
--- a/libpurple/protocols/mxit/chunk.h	Mon May 17 00:18:25 2010 +0000
+++ b/libpurple/protocols/mxit/chunk.h	Mon May 17 01:01:13 2010 +0000
@@ -42,7 +42,7 @@
 #define		CP_CHUNK_OFFER				0x06		/* (6) offer file */
 #define		CP_CHUNK_REJECT				0x07		/* (7) reject file */
 #define		CP_CHUNK_GET				0x08		/* (8) get file */
-#define		CP_CHUNK_RECIEVED			0x09		/* (9) received file */
+#define		CP_CHUNK_RECEIVED			0x09		/* (9) received file */
 #define		CP_CHUNK_DIRECT_SND			0x0A		/* (10) send file direct */
 #define		CP_CHUNK_DIRECT_FWD			0x0B		/* (11) forward file direct */
 #define		CP_CHUNK_SKIN				0x0C		/* (12) MXit client skin */
diff -r 3057fd96be81 -r 815bd8b41638 libpurple/protocols/mxit/protocol.c
--- a/libpurple/protocols/mxit/protocol.c	Mon May 17 00:18:25 2010 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Mon May 17 01:01:13 2010 +0000
@@ -1183,7 +1183,7 @@
 		return;
 	}
 
-	set_chunk_type( chunk, CP_CHUNK_RECIEVED );
+	set_chunk_type( chunk, CP_CHUNK_RECEIVED );
 	set_chunk_length( chunk, size );
 	datalen += MXIT_CHUNK_HEADER_SIZE + size;
 
@@ -1783,7 +1783,7 @@
 			/* this is a ack for a file send. no action is required */
 			break;
 
-		case CP_CHUNK_RECIEVED :
+		case CP_CHUNK_RECEIVED :
 			/* this is a ack for a file received. no action is required */
 			break;
 
diff -r 3057fd96be81 -r 815bd8b41638 libpurple/protocols/oscar/family_icbm.c
--- a/libpurple/protocols/oscar/family_icbm.c	Mon May 17 00:18:25 2010 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Mon May 17 01:01:13 2010 +0000
@@ -1317,7 +1317,7 @@
 	channel = byte_stream_get16(bs);
 
 	if (channel != 0x01) {
-		purple_debug_misc("oscar", "icbm: ICBM recieved on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
+		purple_debug_misc("oscar", "icbm: ICBM received on unsupported channel.  Ignoring. (chan = %04x)\n", channel);
 		return 0;
 	}