From 9f7f743f9e4c5ee9755d8c4cd757b151daa15954 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 5 Jul 2010 18:25:05 +0400 Subject: * Fix chartable module in utf mode --- src/message.c | 2 +- src/plugins/chartable.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/message.c b/src/message.c index ef3cc02e6..834f36f45 100644 --- a/src/message.c +++ b/src/message.c @@ -548,7 +548,7 @@ process_text_part (struct worker_task *task, GByteArray * part_content, GMimeCon text_part->html_urls = g_tree_new ((GCompareFunc) g_ascii_strcasecmp); text_part->urls = g_tree_new ((GCompareFunc) g_ascii_strcasecmp); - text_part->content = strip_html_tags (task, task->task_pool, text_part, part_content, NULL); + text_part->content = strip_html_tags (task, task->task_pool, text_part, text_part->orig, NULL); if (text_part->html_nodes == NULL) { url_parse_text (task->task_pool, task, text_part, FALSE); diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c index e5b5893fb..785cd3a59 100644 --- a/src/plugins/chartable.c +++ b/src/plugins/chartable.c @@ -135,7 +135,7 @@ check_part (struct mime_text_part *part, gboolean raw_mode) else { while (remain > 0) { c = g_utf8_get_char_validated (p, remain); - if (c == (gunichar) - 2 || c == (gunichar) - 1) { + if (c == (gunichar) -2 || c == (gunichar) -1) { /* Invalid characters detected, stop processing */ return FALSE; } @@ -147,12 +147,12 @@ check_part (struct mime_text_part *part, gboolean raw_mode) if (remain > 0) { t = g_utf8_get_char_validated (p, remain); - if (c == (gunichar) - 2 || c == (gunichar) - 1) { + if (t == (gunichar) -2 || t == (gunichar) -1) { /* Invalid characters detected, stop processing */ return FALSE; } sct = g_unichar_get_script (t); - if (g_unichar_isalnum (c) && g_unichar_isalnum (t)) { + if (g_unichar_isalpha (c) && g_unichar_isalpha (t)) { /* We have two unicode alphanumeric characters, so we can check its script */ if (sct != scc) { mark++; -- cgit v1.2.3