sync with 0.8.2cvs8

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index a8d53487b43b81f95f5e9ced8087e9140cc20f01..cc9a05010ab1b1bd9834dc79440ab2e16158eb01 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -168,7 +168,7 @@ TextView *textview_create(void)
        GtkWidget *text_sb;
        GtkWidget *text_mb;
 
-       debug_print(_("Creating text view...\n"));
+       debug_print("Creating text view...\n");
        textview = g_new0(TextView, 1);
 
        scrolledwin_sb = gtk_scrolled_window_new(NULL, NULL);
@@ -478,6 +478,12 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 
        gtk_stext_freeze(text);
 
+#if USE_GPGME
+       if (mimeinfo->sigstatus)
+               g_snprintf(buf, sizeof(buf), "\n[%s (%s)]\n",
+                          mimeinfo->content_type, mimeinfo->sigstatus);
+       else
+#endif
        if (mimeinfo->filename || mimeinfo->name)
                g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]\n",
                           mimeinfo->filename ? mimeinfo->filename :
@@ -1655,6 +1661,10 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                textview_scroll_one_line(textview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                break;
+       case GDK_Delete:
+               if (summaryview)
+                       summary_pass_key_press_event(summaryview, event);
+               break;
        case GDK_n:
        case GDK_N:
        case GDK_p: