From 308d6594df4088ed00e41a7c533377521da8928a Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Wed, 28 Mar 2007 08:30:00 +0000
Subject: put error message in textview when decryption failed.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1581 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog      |  5 +++++
 ChangeLog.ja   |  5 +++++
 src/textview.c | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 31832dd6..8808371e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-28
+
+	* src/textview.c: textview_show_message(): put error message when
+	  decryption failed.
+
 2007-03-28
 
 	* src/folderview.c: folderview_select_next_unread(): temporarily
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 8ea74bc6..76d6601c 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2007-03-28
+
+	* src/textview.c: textview_show_message(): 復号に失敗した場合、
+	  エラーメッセージを出力するようにした。
+
 2007-03-28
 
 	* src/folderview.c: folderview_select_next_unread():
diff --git a/src/textview.c b/src/textview.c
index f19925ff..5a8fa2e0 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -489,7 +489,19 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
 		textview->body_pos = gtk_text_iter_get_offset(&iter);
 	}
 
+#if USE_GPGME
+	if (textview->messageview->msginfo->encinfo &&
+	    textview->messageview->msginfo->encinfo->decryption_failed) {
+		gtk_text_buffer_get_end_iter(buffer, &iter);
+		gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+		gtk_text_buffer_insert_with_tags_by_name
+			(buffer, &iter, _("This message is encrypted, but its decryption failed.\n"),
+			 -1, "error", "mimepart", NULL);
+	}
+#endif
+
 	textview_add_parts(textview, mimeinfo, fp);
+
 #if USE_GPGME
 	if (textview->messageview->msginfo->encinfo &&
 	    textview->messageview->msginfo->encinfo->sigstatus)
-- 
cgit v1.2.3