# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1178232424 0
# Node ID f4bebd09c6713efd107edaae3aeddab8413aaa0e
# Parent  4d8e7fd6e14d5d6997708308c84a47821482ee9b# Parent  a82444e61ece46aca889c2e3f9b6af8db93dc737
merge of '4211727f90723644e020052649b64a5641a1607f'
     and '7f17dc3d84f61d5fb91677bc6c0f31d55a00ac1d'

diff -r 4d8e7fd6e14d -r f4bebd09c671 libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c	Thu May 03 22:39:37 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Thu May 03 22:47:04 2007 +0000
@@ -109,7 +109,9 @@
 	if (!strcmp(name, "251")) {
 		/* 251 is required, so we pluck our nick from here */
 		purple_connection_set_display_name(gc, args[0]);
-	} else if (!strcmp(name, "255")) {
+		/* Some IRC servers seem to not send a 255 numeric, so
+		 * I guess we can't require it; 251 will do. */
+	/* } else if (!strcmp(name, "255")) { */
 		purple_connection_set_state(gc, PURPLE_CONNECTED);
 
 		/* If we're away then set our away message */
diff -r 4d8e7fd6e14d -r f4bebd09c671 libpurple/protocols/msn/user.c
--- a/libpurple/protocols/msn/user.c	Thu May 03 22:39:37 2007 +0000
+++ b/libpurple/protocols/msn/user.c	Thu May 03 22:47:04 2007 +0000
@@ -207,7 +207,7 @@
 		memset(digest, 0, sizeof(digest));
 
 		purple_cipher_context_reset(ctx, NULL);
-		purple_cipher_context_append(ctx, data, strlen((char *)data));
+		purple_cipher_context_append(ctx, (const guchar *)buf, strlen(buf));
 		purple_cipher_context_digest(ctx, sizeof(digest), digest, NULL);
 		purple_cipher_context_destroy(ctx);
 		g_free(buf);