# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1236067391 0
# Node ID 4033fea1709cef430901fe7d4c8c0bdf5a28f6b1
# Parent  d8e6a2d592a4a4e63bdea43fa3371837ebda8205
- oscar.c: encoding while odc should always be utf8.
- server.c: fixed a bug that inverted logic in alias renewal.

diff -r d8e6a2d592a4 -r 4033fea1709c libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Mar 03 06:57:02 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Mar 03 08:03:11 2009 +0000
@@ -4450,14 +4450,9 @@
 
 	g_string_append(msg, "</BODY></HTML>");
 
-	/* iChat and AIM6 use 0x000d to send UTF8. moreover, AIM6 persists only to UTF8! --yaz */
+	/* iChat and AIM6 use 0x000d to send UTF8.
+       moreover, AIM6 persists only to UTF8! --yaz */
 	charset = AIM_CHARSET_QUIRKUTF8;
-	/* Convert the message to a good encoding */
-	purple_plugin_oscar_convert_to_best_encoding(conn->od->gc,
-			conn->bn, msg->str, &tmp, &tmplen, &charset, &charsubset);
-	g_string_free(msg, TRUE);
-	msg = g_string_new_len(tmp, tmplen);
-	g_free(tmp);
 
 	/* Append any binary data that we may have */
 	if (oscar_id) {
diff -r d8e6a2d592a4 -r 4033fea1709c libpurple/server.c
--- a/libpurple/server.c	Tue Mar 03 06:57:02 2009 +0000
+++ b/libpurple/server.c	Tue Mar 03 08:03:11 2009 +0000
@@ -265,7 +265,7 @@
 		purple_blist_server_alias_buddy(b, alias2);
 
 		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_buddy_get_name(b), account);
-		if (conv != NULL && alias2 != NULL && purple_strequal(alias2, who))
+		if (conv != NULL && alias2 != NULL && !purple_strequal(alias2, who))
 		{
 			char *escaped = g_markup_escape_text(who, -1);
 			char *escaped2 = g_markup_escape_text(alias2, -1);