diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.ja | 6 | ||||
| -rw-r--r-- | src/textview.c | 26 |
3 files changed, 30 insertions, 8 deletions
@@ -1,5 +1,11 @@ 2006-09-14 + * src/textview.c: textview_write_error(): new. + Made error messages display with red color. Show error when writing + body failed. + +2006-09-14 + * src/inc.c: inc_pop3_session_do(): update dialog when starting session (fixes incorrect state display in Win32). diff --git a/ChangeLog.ja b/ChangeLog.ja index 32b99a28..b6f908bf 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,11 @@ 2006-09-14 + * src/textview.c: textview_write_error(): 新規。 + エラーメッセージを赤色で表示するようにした。本文の書き込みに失敗 + たらエラーを表示するようにした。 + +2006-09-14 + * src/inc.c: inc_pop3_session_do(): セッションの開始時にダイアログを 更新するようにした(Win32 で状態表示が不正確なのを修正)。 diff --git a/src/textview.c b/src/textview.c index e9d33d59..89db0b52 100644 --- a/src/textview.c +++ b/src/textview.c @@ -89,14 +89,12 @@ static GdkColor emphasis_color = { (gushort)0xcfff }; -#if 0 static GdkColor error_color = { (gulong)0, (gushort)0xefff, (gushort)0, (gushort)0 }; -#endif #if USE_GPGME static GdkColor good_sig_color = { @@ -365,6 +363,9 @@ static void textview_create_tags(TextView *textview) gtk_text_buffer_create_tag(buffer, "emphasis", "foreground-gdk", &emphasis_color, NULL); + gtk_text_buffer_create_tag(buffer, "error", + "foreground-gdk", &error_color, + NULL); #if USE_GPGME gtk_text_buffer_create_tag(buffer, "good-signature", "foreground-gdk", &good_sig_color, @@ -803,18 +804,22 @@ static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo, FILE *fp) } } -void textview_show_error(TextView *textview) +static void textview_write_error(TextView *textview, const gchar *msg) { GtkTextBuffer *buffer; GtkTextIter iter; + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text)); + gtk_text_buffer_get_end_iter(buffer, &iter); + gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, msg, -1, + "error", NULL); +} + +void textview_show_error(TextView *textview) +{ textview_set_font(textview, NULL); textview_clear(textview); - - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text)); - gtk_text_buffer_get_start_iter(buffer, &iter); - gtk_text_buffer_insert(buffer, &iter, - _("This message can't be displayed.\n"), -1); + textview_write_error(textview, _("This message can't be displayed.\n")); } static void textview_write_body(TextView *textview, MimeInfo *mimeinfo, @@ -835,6 +840,11 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo, while (fgets(buf, sizeof(buf), tmpfp) != NULL) textview_write_line(textview, buf, conv); fclose(tmpfp); + } else { + textview_write_error + (textview, + _("The body text couldn't be displayed because " + "writing to temporary file failed.\n")); } conv_code_converter_destroy(conv); |