Mercurial > pidgin
changeset 16842:f4bebd09c671
merge of '4211727f90723644e020052649b64a5641a1607f'
and '7f17dc3d84f61d5fb91677bc6c0f31d55a00ac1d'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 03 May 2007 22:47:04 +0000 |
| parents | 4d8e7fd6e14d (current diff) a82444e61ece (diff) |
| children | 861987e9af41 25338643b420 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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);