sync with 0.8.2cvs8

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index 08faebcb0b8613aa8acfa2062f9e95f6471f22db..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);
@@ -360,7 +360,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
        if (!boundary && (mimeinfo->mime_type == MIME_TEXT || 
                          mimeinfo->mime_type == MIME_TEXT_HTML || 
                          mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
-       
+               
                if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
                        perror("fseek");
                headers = textview_scan_header(textview, fp);
@@ -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 :
@@ -504,7 +510,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                        charset = mimeinfo->charset;
                textview_write_body(textview, mimeinfo, fp, charset);
        }
-
+       
        gtk_stext_thaw(text);
 }
 
@@ -542,7 +548,7 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        textview_set_font(textview, NULL);
        text = GTK_STEXT(textview->text);
        textview_clear(textview);
-
+       
        gtk_stext_freeze(text);
 
        TEXT_INSERT(_("To save this part, pop up the context menu with "));
@@ -583,7 +589,7 @@ void textview_show_signature_part(TextView *textview, MimeInfo *partinfo)
        } else {
                TEXT_INSERT(partinfo->sigstatus_full);
        }
-
+               
        gtk_stext_thaw(text);
 }
 #endif /* USE_GPGME */
@@ -649,6 +655,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
                        textview_write_line(textview, str, NULL);
                }
        }
+       
        html_parser_destroy(parser);
 }
 
@@ -664,6 +671,7 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
        while ((str = ertf_parse(parser)) != NULL) {
                textview_write_line(textview, str, NULL);
        }
+       
        ertf_parser_destroy(parser);
 }
 
@@ -1296,9 +1304,10 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
                        header = g_ptr_array_index(headers, i);
                        g_ptr_array_add(sorted_headers, header);
                }
-       }
+               g_ptr_array_free(headers, TRUE);
+       } else
+               procheader_header_array_destroy(headers);
 
-       g_ptr_array_free(headers, FALSE);
 
        return sorted_headers;
 }
@@ -1652,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:
@@ -1742,7 +1755,7 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                                                                GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
                                                                textview->messageview->mainwin->folderview_cid,
                                                                uri->uri);
-                                               textview->show_url_timeout_tag = gtk_timeout_add( 2000, show_url_timeout_cb, textview );
+                                               textview->show_url_timeout_tag = gtk_timeout_add( 4000, show_url_timeout_cb, textview );
                                                gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
                                        }
                                } else
@@ -1772,8 +1785,7 @@ static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                                                        if (folder_item->prefs && folder_item->prefs->enable_default_account)
                                                                account = account_find_from_id(folder_item->prefs->default_account);
                                                }
-                                               compose_new_with_recipient
-                                                       (account, uri->uri + 7);
+                                               compose_new(account, uri->uri + 7, NULL);
                                        }
                                } else {
                                        open_uri(uri->uri,