# HG changeset patch
# User ivan.komarov@soc.pidgin.im
# Date 1280358805 0
# Node ID a4f579485ce62f03001d800331ec991e6fdc5eb9
# Parent  5661f30d1b8e8fafe1a3bd04dfb92396295c3885
encoding can be NULL in encoding_extract(); this is not an error and
shouldn't be written to the log.

diff -r 5661f30d1b8e -r a4f579485ce6 libpurple/protocols/oscar/encoding.c
--- a/libpurple/protocols/oscar/encoding.c	Wed Jul 28 23:11:14 2010 +0000
+++ b/libpurple/protocols/oscar/encoding.c	Wed Jul 28 23:13:25 2010 +0000
@@ -38,7 +38,9 @@
 {
 	char *begin, *end;
 
-	g_return_val_if_fail(encoding != NULL, NULL);
+	if (encoding == NULL) {
+		return NULL;
+	}
 
 	if (!g_str_has_prefix(encoding, "text/aolrtf; charset=") &&
 		!g_str_has_prefix(encoding, "text/x-aolrtf; charset=") &&