talons

commit 49118714fff8db2ba6b6404501c172933070f789
parent f709f3e92873dd36a41f3a089244422aeed5d8f6
Author: Paul <paul@claws-mail.org>
Date:   Fri, 26 Apr 2013 17:30:34 +0100

replace fuzzy-head fix in 3.9.0-196-g06e09c8 with simpler, better, proper fix

replace fuzzy-head fix in 3.9.0-196-g06e09c8 with simpler, better, proper fix

Signed-off-by: Paul <paul@claws-mail.org>

Diffstat:
M
src/procmime.c
 | 
17
+++++++++--------

1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/procmime.c b/src/procmime.c
@@ -798,16 +798,17 @@ gboolean procmime_scan_text_content(MimeInfo *mimeinfo,
 	} else if (mimeinfo->type == MIMETYPE_TEXT) {
 		while (SC_FGETS(buf, sizeof(buf), tmpfp) != NULL) {
 			str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
-			if (!str)
-				str =  conv_codeset_strdup(buf, conv_get_locale_charset_str(), CS_UTF_8);
 			if (str) {
- 				if ((scan_ret = scan_callback(str, cb_data)) == TRUE) {
- 					g_free(str);
- 					break;
- 				}
- 				g_free(str);	
-			} else
+				if ((scan_ret = scan_callback(str, cb_data)) == TRUE) {
+					g_free(str);
+					break;
+				}
+				g_free(str);
+			} else {
 				conv_fail = TRUE;
+				if ((scan_ret = scan_callback(buf, cb_data)) == TRUE)
+					break;
+			}
 		}
 	}