soc.2010.icq-tlc: 542307fd: encoding can be NULL in encoding_extract...

[ivan.komarov at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 542307fd29430cf230d204d0375529f84786590b
Parent:   e24789bec5488bcbb38f5c3ae22c39c0e6a8c4d8
Author:   ivan.komarov at soc.pidgin.im
Date:     07/28/10 19:13:25
Branch:   im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/542307fd29430cf230d204d0375529f84786590b

Changelog: 

encoding can be NULL in encoding_extract(); this is not an error and
shouldn't be written to the log.

Changes against parent e24789bec5488bcbb38f5c3ae22c39c0e6a8c4d8

  patched  libpurple/protocols/oscar/encoding.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/encoding.c	e2662e8be6ff78517ae4b6224e892a8795b761fb
+++ libpurple/protocols/oscar/encoding.c	8726cdfec9120686b1dde92486283120738c80d1
@@ -38,7 +38,9 @@ encoding_extract(const char *encoding)
 {
 	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=") &&