pidgin: 455c5e75: I before E, except after C
nosnilmot at pidgin.im
nosnilmot at pidgin.im
Sun May 16 21:05:41 EDT 2010
-----------------------------------------------------------------
Revision: 455c5e751f0c8ae1b48b7d4bfd96419340b65970
Ancestor: 84cafc59e7d800d6d632de296e67dc18b8a39714
Author: nosnilmot at pidgin.im
Date: 2010-05-17T01:01:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/455c5e751f0c8ae1b48b7d4bfd96419340b65970
Modified files:
libpurple/protocols/bonjour/jabber.c
libpurple/protocols/irc/msgs.c
libpurple/protocols/mxit/chunk.h
libpurple/protocols/mxit/protocol.c
libpurple/protocols/oscar/family_icbm.c
ChangeLog:
I before E, except after C
-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/jabber.c 88333cc283c7bd6f1a47ada9100ea28108622200
+++ libpurple/protocols/bonjour/jabber.c df92cb312fe76a58419c5f3169a485481650a4a1
@@ -386,7 +386,7 @@ static void bonjour_jabber_stream_ended(
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 @@ static gboolean bonjour_jabber_send_stre
}
/* 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)) {
============================================================
--- libpurple/protocols/irc/msgs.c c972007b3d9f0e0344b7580ddf3b87f8582fd6e9
+++ libpurple/protocols/irc/msgs.c 9c58aa47064d764dfd1522881930892536a88481
@@ -851,7 +851,7 @@ void irc_msg_kick(struct irc_conn *irc,
}
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;
}
============================================================
--- libpurple/protocols/mxit/chunk.h 165ec1fe03510c157204cb85723f6d5787074659
+++ libpurple/protocols/mxit/chunk.h cfa3fad51bfa0a5a6ff0a7f9e416b3137ab432e7
@@ -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 */
============================================================
--- libpurple/protocols/mxit/protocol.c 526588979b939331fb19fbd510c98296ae84e299
+++ libpurple/protocols/mxit/protocol.c ef74ee3468c592a72129051c09b16e85bb255806
@@ -1183,7 +1183,7 @@ void mxit_send_file_received( struct MXi
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 @@ static void mxit_parse_cmd_media( struct
/* 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;
============================================================
--- libpurple/protocols/oscar/family_icbm.c ad2d81ea4dca8c901aa18d21961b1b2309e9f6f9
+++ libpurple/protocols/oscar/family_icbm.c fcbebddf7bb56d37e2e89ffa10da1b73e63cf833
@@ -1317,7 +1317,7 @@ static int outgoingim(OscarData *od, Fla
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;
}
More information about the Commits
mailing list