comparison libpurple/protocols/oscar/family_icbm.c @ 31648:fa88dc1dcabb

merged from im.pidgin.pidgin

31508:c92bc01056ea

			guint16 charset = byte_stream_get16(message);
			byte_stream_advance(message, 2); /* charsubset */

			msg = byte_stream_getstr(message, msglen);
			args->msg = oscar_decode_im(account, userinfo->bn, charset, msg, msglen);
		} else {
			byte_stream_advance(message, length);
		}
	}
}

31648:fa88dc1dcabb

			guint16 charset = byte_stream_get16(message);
			byte_stream_advance(message, 2); /* charsubset */

			msg = byte_stream_getstr(message, msglen);
			args->msg = oscar_decode_im(account, userinfo->bn, charset, msg, msglen);
			g_free(msg);
		} else {
			byte_stream_advance(message, length);
		}
	}
}