diff libpurple/protocols/oscar/encoding.c @ 30391:5661f30d1b8e

Got rid of receiving multipart messages over channel 1, which simplified the code immensely. No client sends them these days, so this is safe. In addition to that, I moved decoding logic from oscar.c to family_icbm.c. Also, removed family_odir stuff which I forgot to remove earlier and which resulted in liboscar failing to load. :(

--- a/libpurple/protocols/oscar/encoding.c	Wed Jul 28 19:37:26 2010 +0000
+++ b/libpurple/protocols/oscar/encoding.c	Wed Jul 28 23:11:14 2010 +0000
@@ -145,7 +145,7 @@
 }
 
 gchar *
-oscar_decode_im_part(PurpleAccount *account, const char *sourcebn, guint16 charset, guint16 charsubset, const gchar *data, gsize datalen)
+oscar_decode_im(PurpleAccount *account, const char *sourcebn, guint16 charset, const gchar *data, gsize datalen)
 {
 	gchar *ret = NULL;
 	/* charsetstr1 is always set to what the correct encoding should be. */
@@ -179,8 +179,8 @@
 		charsetstr2 = purple_account_get_string(account, "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	}
 
-	purple_debug_info("oscar", "Parsing IM part, charset=0x%04hx, charsubset=0x%04hx, datalen=%" G_GSIZE_FORMAT ", choice1=%s, choice2=%s, choice3=%s\n",
-					  charset, charsubset, datalen, charsetstr1, charsetstr2, (charsetstr3 ? charsetstr3 : ""));
+	purple_debug_info("oscar", "Parsing IM, charset=0x%04hx, datalen=%" G_GSIZE_FORMAT ", choice1=%s, choice2=%s, choice3=%s\n",
+					  charset, datalen, charsetstr1, charsetstr2, (charsetstr3 ? charsetstr3 : ""));
 
 	ret = oscar_convert_to_utf8(data, datalen, charsetstr1, FALSE);
 	if (ret == NULL) {