2006-04-06 [mones] 2.1.0cvs7
[claws.git] / src / mimeview.c
index dc3b013c72fa9caf53297618ef96270128148edf..e9a194ba42e598b012ddd6274dc24859298d86c5 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkscrolledwindow.h>
@@ -47,7 +48,6 @@
 #include <fnmatch.h>
 #endif
 
-#include "intl.h"
 #include "main.h"
 #include "mimeview.h"
 #include "textview.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "prefs_common.h"
-#include "rfc2015.h"
+#include "procheader.h"
 #include "stock_pixmap.h"
 #include "gtk/gtkvscrollbutton.h"
+#include "gtk/logwindow.h"
 
 
 typedef enum
@@ -84,7 +85,11 @@ static void mimeview_show_message_part               (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
                                                 MimeViewType    type);
-static void mimeview_clear                     (MimeView       *mimeview);
+gchar *mimeview_get_filename_for_part          (MimeInfo       *partinfo,
+                                                const gchar    *basedir,
+                                                gint            number);
+static gboolean mimeview_write_part            (const gchar    *filename,
+                                                MimeInfo       *partinfo);
 
 static void mimeview_selected          (GtkCTree       *ctree,
                                         GtkCTreeNode   *node,
@@ -115,7 +120,8 @@ static void mimeview_launch         (MimeView       *mimeview);
 static void mimeview_open_with         (MimeView       *mimeview);
 static void mimeview_view_file         (const gchar    *filename,
                                         MimeInfo       *partinfo,
-                                        const gchar    *cmdline);
+                                        const gchar    *cmdline,
+                                        MimeView       *mimeview);
 static gboolean icon_clicked_cb                (GtkWidget      *button, 
                                         GdkEventButton *event, 
                                         MimeView       *mimeview);
@@ -138,7 +144,7 @@ static gboolean icon_list_select_by_number(MimeView *mimeview,
                                           gint          number);
 static void mime_toggle_button_cb      (GtkWidget      *button,
                                         MimeView       *mimeview);
-static void part_button_pressed                (MimeView       *mimeview, 
+static gboolean part_button_pressed    (MimeView       *mimeview, 
                                         GdkEventButton *event, 
                                         MimeInfo       *partinfo);
 static void icon_scroll_size_allocate_cb(GtkWidget     *widget, 
@@ -151,11 +157,7 @@ static GtkItemFactoryEntry mimeview_popup_entries[] =
        {N_("/Open _with..."),    NULL, mimeview_open_with,       0, NULL},
        {N_("/_Display as text"), NULL, mimeview_display_as_text, 0, NULL},
        {N_("/_Save as..."),      NULL, mimeview_save_as,         0, NULL},
-       {N_("/Save _all..."),     NULL, mimeview_save_all,        0, NULL}
-#if USE_GPGME
-        ,
-        {N_("/_Check signature"), NULL, mimeview_check_signature, 0, NULL}
-#endif
+       {N_("/Save _all..."),     NULL, mimeview_save_all,        0, NULL},
 };
 
 static GtkTargetEntry mimeview_mime_types[] =
@@ -170,14 +172,13 @@ MimeView *mimeview_create(MainWindow *mainwin)
 {
        MimeView *mimeview;
 
-       GtkWidget *notebook;
-       GtkWidget *vbox;
        GtkWidget *paned;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
        GtkWidget *mime_notebook;
        GtkWidget *popupmenu;
        GtkWidget *ctree_mainbox;
+       GtkWidget *vbox;
        GtkWidget *mime_toggle;
        GtkWidget *icon_mainbox;
        GtkWidget *icon_scroll;
@@ -187,6 +188,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        GtkWidget *hbox;
        GtkTooltips *tooltips;
        GtkItemFactory *popupfactory;
+       NoticeView *siginfoview;
        gchar *titles[N_MIMEVIEW_COLS];
        gint n_entries;
        gint i;
@@ -198,20 +200,14 @@ MimeView *mimeview_create(MainWindow *mainwin)
        titles[COL_SIZE]     = _("Size");
        titles[COL_NAME]     = _("Name");
 
-       notebook = gtk_notebook_new();
-       gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), TRUE);
-       gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), FALSE);
-       gtk_notebook_set_show_border(GTK_NOTEBOOK(notebook), FALSE);
-
-       vbox = gtk_vbox_new(FALSE, 0);
-       gtk_container_add(GTK_CONTAINER(notebook), vbox);
-       
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_widget_show(scrolledwin);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
+                                      GTK_POLICY_AUTOMATIC);
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
+       gtk_widget_show(ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
        gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
@@ -225,7 +221,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        g_signal_connect(G_OBJECT(ctree), "tree_select_row",
                         G_CALLBACK(mimeview_selected), mimeview);
-       g_signal_connect(G_OBJECT(ctree), "button_press_event",
+       g_signal_connect(G_OBJECT(ctree), "button_release_event",
                         G_CALLBACK(mimeview_button_pressed), mimeview);
        g_signal_connect(G_OBJECT(ctree), "key_press_event",
                         G_CALLBACK(mimeview_key_pressed), mimeview);
@@ -240,14 +236,16 @@ MimeView *mimeview_create(MainWindow *mainwin)
         gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
         gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
        
-       gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
-                               
        icon_vbox = gtk_vbox_new(FALSE, 2);
+       gtk_widget_show(icon_vbox);
        icon_scroll = gtk_layout_new(NULL, NULL);
+       gtk_widget_show(icon_scroll);
        gtk_layout_put(GTK_LAYOUT(icon_scroll), icon_vbox, 0, 0);
        scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
+       gtk_widget_show(scrollbutton);
 
        mime_toggle = gtk_toggle_button_new();
+       gtk_widget_show(mime_toggle);
        arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
        gtk_widget_show(arrow);
        gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
@@ -255,6 +253,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
                         G_CALLBACK(mime_toggle_button_cb), mimeview);
 
        icon_mainbox = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(icon_mainbox);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
        gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
@@ -271,21 +270,27 @@ MimeView *mimeview_create(MainWindow *mainwin)
        tooltips = gtk_tooltips_new();
        gtk_tooltips_set_delay(tooltips, 0); 
 
+       vbox = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(vbox);
+       siginfoview = noticeview_create(mainwin);
+       noticeview_hide(siginfoview);
+       noticeview_set_icon_clickable(siginfoview, TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET_PTR(siginfoview), FALSE, FALSE, 0);
+
        paned = gtk_vpaned_new();
-       gtk_paned_set_gutter_size(GTK_PANED(paned), 6);
+       gtk_widget_show(paned);
+       gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
        gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
-       gtk_paned_pack2(GTK_PANED(paned), mime_notebook, TRUE, TRUE);
-       gtk_container_add(GTK_CONTAINER(notebook), paned);
+       gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
        
        hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(hbox), notebook, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(hbox), icon_mainbox, FALSE, FALSE, 0);
 
-       gtk_widget_show_all(hbox);
+       gtk_widget_show(hbox);
        gtk_widget_hide(ctree_mainbox);
 
-       mimeview->notebook      = notebook;
-       mimeview->vbox          = vbox;
        mimeview->hbox          = hbox;
        mimeview->paned         = paned;
        mimeview->scrolledwin   = scrolledwin;
@@ -303,6 +308,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mimeview->tooltips      = tooltips;
        mimeview->oldsize       = 60;
        mimeview->mime_toggle   = mime_toggle;
+       mimeview->siginfoview   = siginfoview;
 
        mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
        
@@ -319,65 +325,13 @@ void mimeview_init(MimeView *mimeview)
                GTK_WIDGET_PTR(mimeview->textview));
 }
 
-/* 
- * Check whether the message is OpenPGP signed
- */
-#if USE_GPGME
-static gboolean mimeview_is_signed(MimeView *mimeview)
-{
-       MimeInfo *partinfo = NULL;
-
-        debug_print("mimeview_is signed of %p\n", mimeview);
-
-        if (!mimeview) return FALSE;
-       if (!mimeview->opened) return FALSE;
-
-        debug_print("mimeview_is_signed: open\n" );
-
-       if (!mimeview->file) return FALSE;
-
-        debug_print("mimeview_is_signed: file\n" );
-
-       partinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
-       g_return_val_if_fail(partinfo != NULL, FALSE);
-
-       /* walk the tree and see whether there is a signature somewhere */
-       do {
-               if (rfc2015_has_signature(partinfo))
-                       return TRUE;
-        } while ((partinfo = partinfo->parent) != NULL);
-
-       debug_print("mimeview_is_signed: FALSE\n" );
-
-       return FALSE;
-}
-
-static void set_unchecked_signature(MimeInfo *mimeinfo)
-{
-       MimeInfo *sig_partinfo;
-
-       sig_partinfo = rfc2015_find_signature(mimeinfo);
-       if (sig_partinfo == NULL) return;
-
-       g_free(sig_partinfo->sigstatus);
-       sig_partinfo->sigstatus =
-               g_strdup(_("Right-click here to verify the signature"));
-
-       g_free(sig_partinfo->sigstatus_full);
-       sig_partinfo->sigstatus_full = NULL;
-}
-#endif /* USE_GPGME */
-
 void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
        GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
        GtkCTreeNode *node;
-       FILE *fp;
 
        mimeview_clear(mimeview);
-       textview_clear(mimeview->messageview->textview);
 
        g_return_if_fail(file != NULL);
        g_return_if_fail(mimeinfo != NULL);
@@ -386,18 +340,6 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
 
        mimeview->file = g_strdup(file);
 
-#if USE_GPGME
-       if (prefs_common.auto_check_signatures && gpg_started) {
-               if ((fp = fopen(file, "rb")) == NULL) {
-                       FILE_OP_ERROR(file, "fopen");
-                       return;
-               }
-               rfc2015_check_signature(mimeinfo, fp);
-               fclose(fp);
-       } else
-               set_unchecked_signature(mimeinfo);
-#endif
-
        g_signal_handlers_block_by_func(G_OBJECT(ctree), mimeview_selected,
                                        mimeview);
 
@@ -407,29 +349,35 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
                                          mimeview_selected, mimeview);
 
-       /* search first text part */
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-            node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
-               MimeInfo *partinfo;
-
-               partinfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (partinfo &&
-                   (partinfo->mime_type == MIME_TEXT ||
-                    partinfo->mime_type == MIME_TEXT_HTML))
-                       break;
-       }
-       textview_show_message(mimeview->messageview->textview, mimeinfo, file);
-
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
        if (node) {
                gtk_ctree_select(ctree, node);
                icon_list_toggle_by_mime_info
                        (mimeview, gtk_ctree_node_get_row_data(ctree, node));
                gtkut_ctree_set_focus_row(ctree, node);
-               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
-                       gtk_widget_grab_focus(mimeview->ctree);
+       }
+}
+
+#ifdef USE_PTHREAD
+static void mimeview_check_sig_cancel_now(MimeView *mimeview);
+#endif
+
+static void mimeview_free_mimeinfo(MimeView *mimeview)
+{
+       gboolean defer = FALSE;
+#ifdef USE_PTHREAD
+       defer = (mimeview->check_data != NULL);
+       if (defer)
+               mimeview->check_data->free_after_use = TRUE;
+#endif
+       if (mimeview->mimeinfo != NULL && !defer) {
+               procmime_mimeinfo_free_all(mimeview->mimeinfo);
+               mimeview->mimeinfo = NULL;
+       } else if (defer) {
+#ifdef USE_PTHREAD
+               debug_print("deferring free(mimeinfo) and cancelling check\n");
+               mimeview_check_sig_cancel_now(mimeview);
+#endif
        }
 }
 
@@ -439,27 +387,28 @@ void mimeview_destroy(MimeView *mimeview)
        
        for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
                MimeViewer *viewer = (MimeViewer *) cur->data;
-               gtk_container_remove(GTK_CONTAINER(mimeview->mime_notebook),
-                       GTK_WIDGET(viewer->get_widget(viewer)));
                viewer->destroy_viewer(viewer);
        }
        g_slist_free(mimeview->viewers);
        gtk_target_list_unref(mimeview->target_list);
 
-       procmime_mimeinfo_free_all(mimeview->mimeinfo);
-       g_free(mimeview->file);
-       g_free(mimeview);
-
-       mimeviews = g_slist_remove(mimeviews, mimeview);
+       mimeview_free_mimeinfo(mimeview);
+#ifdef USE_PTHREAD
+       if (mimeview->check_data) {
+               mimeview->check_data->destroy_mimeview = TRUE;
+               debug_print("deferring destroy\n");
+       } else 
+#endif
+       {
+               g_free(mimeview->file);
+               g_free(mimeview);
+               mimeviews = g_slist_remove(mimeviews, mimeview);
+       }
        
 }
 
 MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
 {
-       if (gtk_notebook_get_current_page
-               (GTK_NOTEBOOK(mimeview->notebook)) == 0)
-               return NULL;
-
        return gtk_ctree_node_get_row_data
                (GTK_CTREE(mimeview->ctree), mimeview->opened);
 }
@@ -472,50 +421,34 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
 
        g_return_if_fail(mimeinfo != NULL);
 
-       if (mimeinfo->children)
-               mimeinfo = mimeinfo->children;
-
        while (mimeinfo != NULL) {
                node = mimeview_append_part(mimeview, mimeinfo, parent);
 
-               if (mimeinfo->children)
-                       mimeview_set_multipart_tree(mimeview, mimeinfo, node);
-               else if (mimeinfo->sub &&
-                        mimeinfo->sub->mime_type != MIME_TEXT &&
-                        mimeinfo->sub->mime_type != MIME_TEXT_HTML)
-                       mimeview_set_multipart_tree(mimeview, mimeinfo->sub,
-                                                   node);
-               mimeinfo = mimeinfo->next;
+               if (mimeinfo->node->children)
+                       mimeview_set_multipart_tree(mimeview, (MimeInfo *) mimeinfo->node->children->data, node);
+               mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
        }
 }
 
-static gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_part_name(MimeInfo *partinfo)
 {
-#if USE_GPGME
-       if (partinfo->sigstatus)
-               return partinfo->sigstatus;
-       else
-#endif
-       if (partinfo->name)
-               return partinfo->name;
-       else if (partinfo->filename)
-               return partinfo->filename;
-       else if (partinfo->description)
-               return partinfo->description;
-       else
-               return "";
+       const gchar *name;
+
+       name = procmime_mimeinfo_get_parameter(partinfo, "filename");
+       if (name == NULL)
+               name = procmime_mimeinfo_get_parameter(partinfo, "name");
+       if (name == NULL)
+               name = "";
+
+       return name;
 }
 
-static gchar *get_part_description(MimeInfo *partinfo)
+static const gchar *get_part_description(MimeInfo *partinfo)
 {
        if (partinfo->description)
                return partinfo->description;
-       else if (partinfo->name)
-               return partinfo->name;
-       else if (partinfo->filename)
-               return partinfo->filename;
        else
-               return "";
+               return get_part_name(partinfo);
 }
 
 static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
@@ -524,17 +457,23 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
 {
        GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
        GtkCTreeNode *node;
+       static gchar content_type[64];
        gchar *str[N_MIMEVIEW_COLS];
 
-       str[COL_MIMETYPE] =
-               partinfo->content_type ? partinfo->content_type : "";
-       str[COL_SIZE] = to_human_readable(partinfo->size);
+       if (partinfo->type != MIMETYPE_UNKNOWN && partinfo->subtype) {
+               g_snprintf(content_type, 64, "%s/%s", procmime_get_media_type_str(partinfo->type), partinfo->subtype);
+       } else {
+               g_snprintf(content_type, 64, "UNKNOWN");
+       }
+
+       str[COL_MIMETYPE] = content_type;
+       str[COL_SIZE] = to_human_readable(partinfo->length);
        if (prefs_common.attach_desc)
-               str[COL_NAME] = get_part_description(partinfo);
+               str[COL_NAME] = (gchar *) get_part_description(partinfo);
        else
-               str[COL_NAME] = get_part_name(partinfo);
+               str[COL_NAME] = (gchar *) get_part_name(partinfo);
 
-       node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
+       node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
                                     NULL, NULL, NULL, NULL,
                                     FALSE, TRUE);
        gtk_ctree_node_set_row_data(ctree, node, partinfo);
@@ -546,27 +485,18 @@ static void mimeview_show_message_part(MimeView *mimeview, MimeInfo *partinfo)
 {
        FILE *fp;
        const gchar *fname;
-#if USE_GPGME
-       MimeInfo *pi;
-#endif
 
        if (!partinfo) return;
 
-#if USE_GPGME
-       for (pi = partinfo; pi && !pi->plaintextfile ; pi = pi->parent)
-               ;
-       fname = pi ? pi->plaintextfile : mimeview->file;
-#else
        fname = mimeview->file;
-#endif /* USE_GPGME */
        if (!fname) return;
 
-       if ((fp = fopen(fname, "rb")) == NULL) {
+       if ((fp = g_fopen(fname, "rb")) == NULL) {
                FILE_OP_ERROR(fname, "fopen");
                return;
        }
 
-       if (fseek(fp, partinfo->fpos, SEEK_SET) < 0) {
+       if (fseek(fp, partinfo->offset, SEEK_SET) < 0) {
                FILE_OP_ERROR(mimeview->file, "fseek");
                fclose(fp);
                return;
@@ -600,8 +530,8 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
                gint i = 0;
 
                while (curfactory->content_types[i] != NULL) {
-                       debug_print("%s\n", curfactory->content_types[i]);
                        if(!fnmatch(curfactory->content_types[i], content_type, FNM_CASEFOLD)) {
+                               debug_print("%s\n", curfactory->content_types[i]);
                                factory = curfactory;
                                break;
                        }
@@ -633,11 +563,17 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
        gchar *content_type = NULL;
        MimeViewer *viewer = NULL;
 
-       if ((partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) &&
-           (partinfo->name != NULL)) {
-               content_type = procmime_get_mime_type(partinfo->name);
+       if ((partinfo->type == MIMETYPE_APPLICATION) &&
+            (!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
+               const gchar *filename;
+
+               filename = procmime_mimeinfo_get_parameter(partinfo, "filename");
+               if (filename == NULL)
+                       filename = procmime_mimeinfo_get_parameter(partinfo, "name");
+               if (filename != NULL)
+                       content_type = procmime_get_mime_type(filename);
        } else {
-               content_type = g_strdup(partinfo->content_type);
+               content_type = procmime_get_content_type_str(partinfo->type, partinfo->subtype);
        }
 
        if (content_type != NULL) {
@@ -648,7 +584,7 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
        return viewer;
 }
 
-static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
+gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 {
        MimeViewer *viewer;
        
@@ -660,16 +596,17 @@ static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
                return FALSE;
        }
 
+       if (mimeview->mimeviewer != NULL)
+               mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
+
        if (mimeview->mimeviewer != viewer) {
-               if (mimeview->mimeviewer != NULL)
-                       mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
                mimeview->mimeviewer = viewer;
                mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
        }
+       viewer->mimeview = mimeview;
        viewer->show_mimepart(viewer, mimeview->file, partinfo);
 
-#warning FIXME_GTK2 Is it correct?
-       return FALSE;
+       return TRUE;
 }
 
 static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
@@ -681,12 +618,12 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 
        switch (type) {
        case MIMEVIEW_TEXT:
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
                        gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
                        GTK_WIDGET_PTR(textview)));
                break;
        case MIMEVIEW_VIEWER:
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
                        gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook), 
                        GTK_WIDGET(mimeview->mimeviewer->get_widget(mimeview->mimeviewer))));
                break;
@@ -697,34 +634,395 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
        mimeview->type = type;
 }
 
-static void mimeview_clear(MimeView *mimeview)
+void mimeview_clear(MimeView *mimeview)
 {
-       GtkCList *clist = GTK_CLIST(mimeview->ctree);
+       GtkCList *clist = NULL;
+       
+       if (!mimeview)
+               return;
 
-       procmime_mimeinfo_free_all(mimeview->mimeinfo);
-       mimeview->mimeinfo = NULL;
+       if (g_slist_find(mimeviews, mimeview) == NULL)
+               return;
+       
+       clist = GTK_CLIST(mimeview->ctree);
+       
+       noticeview_hide(mimeview->siginfoview);
 
        gtk_clist_clear(clist);
        textview_clear(mimeview->textview);
        if (mimeview->mimeviewer != NULL)
                mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
 
+       mimeview_free_mimeinfo(mimeview);
+
+       mimeview->mimeinfo = NULL;
+
        mimeview->opened = NULL;
 
        g_free(mimeview->file);
        mimeview->file = NULL;
 
        icon_list_clear(mimeview);
+       mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+}
+
+static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+void mimeview_check_signature(MimeView *mimeview);
+static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
+
+static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, 
+                                       gboolean special, SignatureStatus code)
+{
+       gchar *text = NULL, *button_text = NULL;
+       void  *func = NULL;
+       StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+       SignatureStatus mycode = SIGNATURE_UNCHECKED;
+       
+       g_return_if_fail(mimeview != NULL);
+       g_return_if_fail(mimeinfo != NULL);
+       
+       if (special)
+               mycode = code;
+       else 
+               mycode = privacy_mimeinfo_get_sig_status(mimeinfo);
+
+       switch (mycode) {
+       case SIGNATURE_UNCHECKED:
+               button_text = _("Check signature");
+               func = check_signature_cb;
+               icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+               break;
+       case SIGNATURE_OK:
+               button_text = _("View full information");
+               func = display_full_info_cb;
+               icon = STOCK_PIXMAP_PRIVACY_PASSED;
+               break;
+       case SIGNATURE_WARN:
+               button_text = _("View full information");
+               func = display_full_info_cb;
+               icon = STOCK_PIXMAP_PRIVACY_WARN;
+               break;
+       case SIGNATURE_INVALID:
+               button_text = _("View full information");
+               func = display_full_info_cb;
+               icon = STOCK_PIXMAP_PRIVACY_FAILED;
+               break;
+       case SIGNATURE_CHECK_FAILED:
+               button_text = _("Check again");
+               func = check_signature_cb;
+               icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+       case SIGNATURE_CHECK_TIMEOUT:
+               button_text = _("Check again");
+               func = check_signature_cb;
+               icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+       default:
+               break;
+       }
+       if (mycode == SIGNATURE_UNCHECKED) {
+               gchar *tmp = privacy_mimeinfo_sig_info_short(mimeinfo);
+               text = g_strdup_printf("%s %s",
+                       tmp, _("Click the icon or hit 'C' to check it."));
+               g_free(tmp);
+       } else if (mycode != SIGNATURE_CHECK_TIMEOUT) {
+               text = privacy_mimeinfo_sig_info_short(mimeinfo);
+       } else if (mycode == SIGNATURE_CHECK_TIMEOUT) {
+               text = g_strdup(_("Timeout checking the signature. Click the icon or hit 'C' to try again."));
+       }
+
+       noticeview_set_text(mimeview->siginfoview, text);
+       gtk_label_set_selectable(GTK_LABEL(mimeview->siginfoview->text), TRUE);
+
+       g_free(text);
+       noticeview_set_button_text(mimeview->siginfoview, NULL);
+       noticeview_set_button_press_callback(
+               mimeview->siginfoview,
+               G_CALLBACK(func),
+               (gpointer) mimeview);
+       noticeview_set_icon(mimeview->siginfoview, icon);
+       noticeview_set_tooltip(mimeview->siginfoview, button_text);
+}
+
+#ifdef USE_PTHREAD
 
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mimeview->mime_toggle)))
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
+/* reset all thread stuff, and do the cleanups we've been left to do */
+static void mimeview_check_data_reset(MimeView *mimeview)
+{
+       if (!mimeview->check_data)
+               return;
+
+       if (mimeview->check_data->free_after_use) {
+               debug_print("freeing deferred mimeinfo\n");
+               procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
+       }
+       if (mimeview->check_data->destroy_mimeview) {
+               debug_print("freeing deferred mimeview\n");
+               g_free(mimeview->file);
+               g_free(mimeview);
+               mimeviews = g_slist_remove(mimeviews, mimeview);
+       }
+
+       g_free(mimeview->check_data);
+       mimeview->check_data = NULL;
+}
+
+/* GUI update once the checker thread is done or killed */
+static gboolean mimeview_check_sig_thread_cb(void *data)
+{
+       MimeView *mimeview = (MimeView *) data;
+       MimeInfo *mimeinfo = mimeview->siginfo;
+
+       debug_print("mimeview_check_sig_thread_cb\n");
+       
+       if (mimeinfo == NULL) {
+               /* message changed !? */
+               g_warning("no more siginfo!\n");
+               goto end;
+       }
+       
+       if (!mimeview->check_data) {
+               g_warning("nothing to check\n");
+               return FALSE;
+       }
+
+       if (mimeview->check_data->siginfo != mimeinfo) {
+               /* message changed !? */
+               g_warning("different siginfo!\n");
+               goto end;
+       }
+
+       if (mimeview->check_data->destroy_mimeview ||
+           mimeview->check_data->free_after_use) {
+               debug_print("not bothering, we're changing message\n"); 
+               goto end;
+       }
+       
+       /* update status */
+       if (mimeview->check_data->timeout) 
+               update_signature_noticeview(mimeview, mimeview->siginfo, 
+                       TRUE, SIGNATURE_CHECK_TIMEOUT);
+       else
+               update_signature_noticeview(mimeview, mimeview->siginfo, 
+                       FALSE, 0);
+       icon_list_clear(mimeview);
+       icon_list_create(mimeview, mimeview->mimeinfo);
+       
+end:
+       mimeview_check_data_reset(mimeview);
+       return FALSE;
+}
+
+/* sig checker thread */
+static void *mimeview_check_sig_worker_thread(void *data)
+{
+       MimeView *mimeview = (MimeView *)data;
+       MimeInfo *mimeinfo = mimeview->siginfo;
+       
+       debug_print("checking...\n");
+
+       if (!mimeview->check_data)
+               return NULL;
+
+       if (mimeinfo && mimeinfo == mimeview->check_data->siginfo)
+               privacy_mimeinfo_check_signature(mimeinfo);
+       else {
+               /* that's strange! we changed message without 
+                * getting killed. */
+               g_warning("different siginfo!\n");
+               mimeview_check_data_reset(mimeview);
+               return NULL;
+       }
+
+       /* use g_timeout so that GUI updates is done from the
+        * correct thread */
+       g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+       
+       return NULL;
+}
+
+/* killer thread - acts when the checker didn't work fast
+ * enough. */
+static void *mimeview_check_sig_cancel_thread(void *data)
+{
+       MimeView *mimeview = (MimeView *)data;
+       
+       if (!mimeview->check_data)
+               return NULL; /* nothing to kill ! */
+
+       /* wait for a few seconds... */
+       debug_print("waiting a while\n");
+
+       sleep(5);
+       
+       if (!mimeview->check_data)
+               return NULL; /* nothing to kill, it's done in time :) */
+       
+       /* too late, go away checker thread */
+       debug_print("killing checker thread\n");
+       pthread_cancel(mimeview->check_data->th);
+       
+       /* tell upstream it was a timeout */
+       mimeview->check_data->timeout = TRUE;
+       /* use g_timeout so that GUI updates is done from the
+        * correct thread */
+       g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+
+       return NULL;
+}
+
+/* get rid of the checker thread right now - used when changing the
+ * displayed message for example. */
+static void mimeview_check_sig_cancel_now(MimeView *mimeview)
+{
+       if (!mimeview->check_data)
+               return;
+       debug_print("killing checker thread NOW\n");
+       pthread_cancel(mimeview->check_data->th);
+
+       /* tell upstream it was a timeout */
+       mimeview->check_data->timeout = TRUE;
+       mimeview_check_sig_thread_cb(mimeview);
+       return;
+}
+
+/* creates a thread to check the signature, and a second one
+ * to kill the first one after a timeout */
+static void mimeview_check_sig_in_thread(MimeView *mimeview)
+{
+       pthread_t th, th2;
+       pthread_attr_t detach, detach2;
+       
+       if (mimeview->check_data) {
+               g_warning("already checking it");
+               return;
+       }
+       
+       mimeview->check_data = g_new0(SigCheckData, 1);
+       mimeview->check_data->siginfo = mimeview->siginfo;
+       debug_print("creating thread\n");
+
+       pthread_attr_init(&detach);
+       pthread_attr_setdetachstate(&detach, TRUE);
+
+       pthread_attr_init(&detach2);
+       pthread_attr_setdetachstate(&detach2, TRUE);
+
+       /* create the checker thread */
+       if (pthread_create(&th, &detach, 
+                       mimeview_check_sig_worker_thread, 
+                       mimeview) != 0) {
+               /* arh. We'll do it synchronously. */
+               g_warning("can't create thread");
+               g_free(mimeview->check_data);
+               mimeview->check_data = NULL;
+               return;
+       } else 
+               mimeview->check_data->th = th;
+
+       /* create the killer thread */
+       pthread_create(&th2, &detach2, 
+                       mimeview_check_sig_cancel_thread, 
+                       mimeview);
+}
+#endif
+
+static void check_signature_cb(GtkWidget *widget, gpointer user_data)
+{
+       MimeView *mimeview = (MimeView *) user_data;
+       MimeInfo *mimeinfo = mimeview->siginfo;
+       
+       if (mimeinfo == NULL)
+               return;
+#ifdef USE_PTHREAD
+       if (mimeview->check_data)
+               return;
+#endif
+       noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
+       GTK_EVENTS_FLUSH();
+#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+       /* let's do it non-blocking */
+       mimeview_check_sig_in_thread(mimeview);
+       if (!mimeview->check_data) /* let's check syncronously */
+#endif
+       {
+               debug_print("checking without thread\n");
+               privacy_mimeinfo_check_signature(mimeinfo);
+               update_signature_noticeview(mimeview, mimeview->siginfo, FALSE, 0);
+               icon_list_clear(mimeview);
+               icon_list_create(mimeview, mimeview->mimeinfo);
+       }
+}
+
+void mimeview_check_signature(MimeView *mimeview)
+{
+       check_signature_cb(NULL, mimeview);     
+}
+
+static void redisplay_email(GtkWidget *widget, gpointer user_data)
+{
+       MimeView *mimeview = (MimeView *) user_data;
+       GtkCTreeNode *node = mimeview->opened;
+       mimeview->opened = NULL;
+       mimeview_selected(GTK_CTREE(mimeview->ctree), node, 0, mimeview);
+}
+
+static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
+{
+       MimeView *mimeview = (MimeView *) user_data;
+       gchar *siginfo;
+
+       siginfo = privacy_mimeinfo_sig_info_full(mimeview->siginfo);
+       textview_set_text(mimeview->textview, siginfo);
+       g_free(siginfo);
+       noticeview_set_button_text(mimeview->siginfoview, NULL);
+       noticeview_set_button_press_callback(
+               mimeview->siginfoview,
+               G_CALLBACK(redisplay_email),
+               (gpointer) mimeview);
+       noticeview_set_tooltip(mimeview->siginfoview, _("Go back to email"));
+}
+
+static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
+{
+       MimeInfo *siginfo;
+       MimeInfo *first_text;
+       
+       g_return_if_fail(mimeview != NULL);
+       g_return_if_fail(selected != NULL);
+       
+       if (selected->type == MIMETYPE_MESSAGE 
+       &&  !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
+               /* if the first text part is signed, check that */
+               first_text = selected;
+               while (first_text && first_text->type != MIMETYPE_TEXT) {
+                       first_text = procmime_mimeinfo_next(first_text);
+               }
+               if (first_text) {
+                       update_signature_info(mimeview, first_text);
+                       return;
+               }       
+       }
+
+       siginfo = selected;
+       while (siginfo != NULL) {
+               if (privacy_mimeinfo_is_signed(siginfo))
+                       break;
+               siginfo = procmime_mimeinfo_parent(siginfo);
+       }
+       mimeview->siginfo = siginfo;
+       
+       if (siginfo == NULL) {
+               noticeview_hide(mimeview->siginfoview);
+               return;
+       }
+       
+       update_signature_noticeview(mimeview, siginfo, FALSE, 0);
+       noticeview_show(mimeview->siginfoview);
 }
 
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                              MimeView *mimeview)
 {
        MimeInfo *partinfo;
-
        if (mimeview->opened == node) return;
        mimeview->opened = node;
        gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
@@ -740,28 +1038,22 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        }
        
        mimeview->textview->default_text = FALSE;
-       
+
+       update_signature_info(mimeview, partinfo);
+
        if (!mimeview_show_part(mimeview, partinfo)) {
-               switch (partinfo->mime_type) {
-               case MIME_TEXT:
-               case MIME_TEXT_HTML:
-               case MIME_TEXT_ENRICHED:
-               case MIME_MESSAGE_RFC822:
-               case MIME_MULTIPART:
+               switch (partinfo->type) {
+               case MIMETYPE_TEXT:
+               case MIMETYPE_MESSAGE:
+               case MIMETYPE_MULTIPART:
                        mimeview_show_message_part(mimeview, partinfo);
                
                        break;
                default:
-                       mimeview->textview->default_text = TRUE;        
+                       mimeview->textview->default_text = TRUE;
                        mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
-#if USE_GPGME
-                       if (g_strcasecmp(partinfo->content_type,
-                                        "application/pgp-signature") == 0)
-                               textview_show_signature_part(mimeview->textview,
-                                                            partinfo);
-                       else
-#endif
-                               textview_show_mime_part(mimeview->textview, partinfo);
+                       textview_clear(mimeview->textview);
+                       textview_show_mime_part(mimeview->textview, partinfo);
                        break;
                }
        }
@@ -776,7 +1068,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        g_return_if_fail(mimeview != NULL);
 
        partinfo = mimeview_get_selected_part(mimeview);
-       if (partinfo->filename == NULL && partinfo->name == NULL) return;
+       if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
 
        context = gtk_drag_begin(widget, mimeview->target_list,
                                 GDK_ACTION_COPY, button, event);
@@ -801,49 +1093,54 @@ static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
        }
        part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
 
-       return TRUE;
+       return FALSE;
 }
 
-static void part_button_pressed(MimeView *mimeview, GdkEventButton *event, 
-                               MimeInfo *partinfo)
+/* from gdkevents.c */
+#define DOUBLE_CLICK_TIME 250
+
+static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event, 
+                                   MimeInfo *partinfo)
 {
+       static MimeInfo *lastinfo;
+       static guint32 lasttime;
+
        if (event->button == 2 ||
-           (event->button == 1 && event->type == GDK_2BUTTON_PRESS)) {
+           (event->button == 1 && (event->time - lasttime) < DOUBLE_CLICK_TIME && lastinfo == partinfo)) {
                /* call external program for image, audio or html */
                mimeview_launch(mimeview);
+               return TRUE;
        } else if (event->button == 3) {
-               if (partinfo && (partinfo->mime_type == MIME_TEXT ||
-                                partinfo->mime_type == MIME_TEXT_HTML ||
-                                partinfo->mime_type == MIME_TEXT_ENRICHED ||
-                                partinfo->mime_type == MIME_MESSAGE_RFC822 ||
-                                partinfo->mime_type == MIME_IMAGE ||
-                                partinfo->mime_type == MIME_MULTIPART))
+               if (partinfo && (partinfo->type == MIMETYPE_TEXT ||
+                                partinfo->type == MIMETYPE_MESSAGE ||
+                                partinfo->type == MIMETYPE_IMAGE ||
+                                partinfo->type == MIMETYPE_MULTIPART))
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Display as text", FALSE);
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Display as text", TRUE);
                if (partinfo &&
-                   partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM)
+                   partinfo->type == MIMETYPE_APPLICATION &&
+                   !g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Open", FALSE);
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Open", TRUE);
 
-#if USE_GPGME
-               menu_set_sensitive(mimeview->popupfactory,
-                                  "/Check signature",
-                                  mimeview_is_signed(mimeview));
-#endif
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", partinfo);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", partinfo);
                                    
                gtk_menu_popup(GTK_MENU(mimeview->popupmenu),
                               NULL, NULL, NULL, NULL,
                               event->button, event->time);
+               return TRUE;
        }
 
+       lastinfo = partinfo;
+       lasttime = event->time;
+       return FALSE;
 }
 
 
@@ -855,17 +1152,9 @@ void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
-#warning FIXME_GTK2
-#if 0
 #define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(ctree), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
-                                            "key_press_event"); \
-       }
-#else
-#define KEY_PRESS_EVENT_STOP()
-#endif
+        g_signal_stop_emission_by_name(G_OBJECT(ctree), \
+                                       "key_press_event");
 
 static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 MimeView *mimeview)
@@ -877,6 +1166,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
 
+       summaryview = mimeview->messageview->mainwin->summaryview;
+       
+       if (summaryview && quicksearch_has_focus(summaryview->quicksearch))
+               return FALSE;
+               
        switch (event->keyval) {
        case GDK_space:
                if (textview_scroll_page(mimeview->textview, FALSE))
@@ -927,12 +1221,22 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview);
                return TRUE;
+       case GDK_o:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_open_with(mimeview);
+               return TRUE;
+       case GDK_c:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_check_signature(mimeview);
+               return TRUE;
        default:
                break;
        }
 
        if (!mimeview->messageview->mainwin) return FALSE;
-       summaryview = mimeview->messageview->mainwin->summaryview;
+
        summary_pass_key_press_event(summaryview, event);
        return TRUE;
 }
@@ -944,8 +1248,7 @@ static void mimeview_drag_data_get(GtkWidget           *widget,
                                   guint             time,
                                   MimeView         *mimeview)
 {
-       gchar *filename, *uriname;
-       const gchar *bname;
+       gchar *filename = NULL, *uriname, *tmp;
        MimeInfo *partinfo;
 
        if (!mimeview->opened) return;
@@ -953,20 +1256,52 @@ static void mimeview_drag_data_get(GtkWidget         *widget,
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
-       if (!partinfo->filename && !partinfo->name) return;
 
-       filename = partinfo->filename ? partinfo->filename : partinfo->name;
-       bname = g_basename(filename);
-       if (*bname == '\0') return;
+       if (strlen(get_part_name(partinfo)) > 0) {
+               filename = g_path_get_basename(get_part_name(partinfo));
+               if (*filename == '\0') return;
+       } else if (partinfo->type == MIMETYPE_MESSAGE 
+                  && !g_ascii_strcasecmp(partinfo->subtype, "rfc822")) {
+               gchar *name = NULL;
+               GPtrArray *headers = NULL;
+               FILE *fp;
+
+               fp = g_fopen(partinfo->data.filename, "rb");
+               fseek(fp, partinfo->offset, SEEK_SET);
+               headers = procheader_get_header_array_asis(fp);
+               if (headers) {
+                       gint i;
+                       for (i = 0; i < headers->len; i++) {
+                               Header *header = g_ptr_array_index(headers, i);
+                               if (procheader_headername_equal(header->name, "Subject")) {
+                                       unfold_line(header->body);
+                                       name = g_strconcat(header->body, ".txt", NULL);
+                                       subst_for_filename(name);
+                               }
+                       }
+                       procheader_header_array_destroy(headers);
+               }
+               fclose(fp);
+               if (name)
+                       filename = g_path_get_basename(name);
+               g_free(name);
+       }
+       if (filename == NULL)
+               filename = g_path_get_basename("Unnamed part");
+               
 
+       tmp = g_filename_from_utf8(filename, -1, NULL, NULL, NULL);
+       
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
-                              bname, NULL);
+                              tmp, NULL);
+
+       g_free(tmp);
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
+       if (procmime_get_part(filename, partinfo) < 0)
                alertpanel_error
                        (_("Can't save the part of multipart message."));
+       uriname = g_strconcat("file://", filename, "\r\n", NULL);
 
-       uriname = g_strconcat("file:/", filename, NULL);
        gtk_selection_data_set(selection_data, selection_data->target, 8,
                               uriname, strlen(uriname));
 
@@ -974,123 +1309,228 @@ static void mimeview_drag_data_get(GtkWidget       *widget,
        g_free(filename);
 }
 
-static void mimeview_save_all(MimeView *mimeview)
+/**
+ * Returns a filename (with path) for an attachment
+ * \param partinfo The attachment to save
+ * \param basedir The target directory
+ * \param number Used for dummy filename if attachment is unnamed
+ */
+gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
+                                     const gchar *basedir,
+                                     gint number)
 {
-       gchar *dirname;
-       gchar *defname = NULL;
-       MimeInfo *partinfo;
-       MimeInfo *attachment;
-       gchar buf[1024];
+       gchar *fullname;
+       gchar *filename;
 
-       if (!mimeview->opened) return;
-       if (!mimeview->file) return;
+       filename = g_strdup(get_part_name(partinfo));
+       if (!filename || !*filename)
+               filename = g_strdup_printf("noname.%d", number);
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       g_return_if_fail(partinfo != NULL);
+       if (!g_utf8_validate(filename, -1, NULL)) {
+               gchar *tmp = conv_filename_to_utf8(filename);
+               g_free(filename);
+               filename = tmp;
+       }
+       
+       subst_for_filename(filename);
 
-       dirname = filesel_select_file(_("Save as"), defname);
-       if (!dirname) return;
-
-       /* return to first children */
-       if (!partinfo->parent->children) return;  /* multipart container? */
-       attachment = partinfo->parent->children->next;
-       /* for each attachment, extract it in the selected dir. */
-       while (attachment != NULL) {
-               static guint subst_cnt = 1;
-               gchar *attachdir;
-               gchar *attachname = g_strdup(get_part_name(attachment));
-               AlertValue aval = G_ALERTDEFAULT;
-               gchar *res;
+       fullname = g_strconcat
+               (basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR)
+                ? &filename[1] : filename, NULL);
 
-               if (!attachname || !strlen(attachname))
-                       attachname = g_strdup_printf("noname.%d",subst_cnt++);
-               subst_chars(attachname, ":?*&|<>\t\r\n", '_');
-               g_snprintf(buf, sizeof(buf), "%s%s",
-                          dirname,
-                          (attachname[0] == G_DIR_SEPARATOR)
-                          ? &attachname[1]
-                          : attachname);
-               subst_chars(buf, "/\\", G_DIR_SEPARATOR);
-               attachdir = g_dirname(buf);
-               make_dir_hier(attachdir);
-               g_free(attachdir);
-
-               if (is_file_exist(buf)) {
-                       res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-                                             attachname);
-                       aval = alertpanel(_("Overwrite"), res, _("OK"), 
-                                         _("Cancel"), NULL);
-                       g_free(res);                                      
-               }
-               g_free(attachname);
+       g_free(filename);
+       filename = conv_filename_from_utf8(fullname);
+       g_free(fullname);
+       return filename;
+}
+
+/**
+ * Write a single attachment to file
+ * \param filename Filename with path
+ * \param partinfo Attachment to save
+ */
+static gboolean mimeview_write_part(const gchar *filename,
+                                   MimeInfo *partinfo)
+{
+       gchar *dir;
+       
+       dir= g_path_get_dirname(filename);
+       if (!is_dir_exist(dir))
+               make_dir_hier(dir);
+       g_free(dir);
+
+       if (is_file_exist(filename)) {
+               AlertValue aval;
+               gchar *res;
+               gchar *tmp;
+               
+               if (!g_utf8_validate(filename, -1, NULL))
+                       tmp = conv_filename_to_utf8(filename);
+               else 
+                       tmp = g_strdup(filename);
+               
+               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+                                     tmp);
+               g_free(tmp);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL, 
+                                 GTK_STOCK_OK, NULL);
+               g_free(res);                                      
+               if (G_ALERTALTERNATE != aval) return FALSE;
+       }
 
-               if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, mimeview->file, attachment) < 0))
-                       alertpanel_error(_("Can't save the part of multipart message."));
-               attachment = attachment->next;
+       if (procmime_get_part(filename, partinfo) < 0) {
+               alertpanel_error
+                       (_("Can't save the part of multipart message."));
+               return FALSE;
        }
+
+       return TRUE;
 }
 
-static void mimeview_display_as_text(MimeView *mimeview)
+/**
+ * Menu callback: Save all attached files
+ * \param mimeview Current display
+ */
+static void mimeview_save_all(MimeView *mimeview)
 {
        MimeInfo *partinfo;
+       gchar *dirname;
+       gchar *startdir = NULL;
+       gint number = 1;
 
        if (!mimeview->opened) return;
+       if (!mimeview->file) return;
+       if (!mimeview->mimeinfo) return;
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo)  {
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
-                        "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
-       
-       }                        
-       g_return_if_fail(partinfo != NULL);
-       mimeview_show_message_part(mimeview, partinfo);
+       partinfo = mimeview->mimeinfo;
+       if (prefs_common.attach_save_dir)
+               startdir = g_strconcat(prefs_common.attach_save_dir,
+                                      G_DIR_SEPARATOR_S, NULL);
+
+       dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
+       if (!dirname) {
+               g_free(startdir);
+               return;
+       }
+
+       if (!is_dir_exist (dirname)) {
+               alertpanel_error(_("'%s' is not a directory."),
+                                dirname);
+               g_free(startdir);
+               return;
+       }
+
+       if (dirname[strlen(dirname)-1] == G_DIR_SEPARATOR)
+               dirname[strlen(dirname)-1] = '\0';
+
+       /* Skip the first part, that is sometimes DISPOSITIONTYPE_UNKNOWN */
+       if (partinfo && partinfo->type == MIMETYPE_MESSAGE)
+               partinfo = procmime_mimeinfo_next(partinfo);
+       if (partinfo && partinfo->type == MIMETYPE_MULTIPART) {
+               partinfo = procmime_mimeinfo_next(partinfo);
+               if (partinfo && partinfo->type == MIMETYPE_TEXT)
+                       partinfo = procmime_mimeinfo_next(partinfo);
+       }
+               
+       while (partinfo != NULL) {
+               if (partinfo->type != MIMETYPE_MESSAGE &&
+                   partinfo->type != MIMETYPE_MULTIPART &&
+                   partinfo->disposition != DISPOSITIONTYPE_INLINE) {
+                       gchar *filename = mimeview_get_filename_for_part
+                               (partinfo, dirname, number++);
+
+                       mimeview_write_part(filename, partinfo);
+                       g_free(filename);
+               }
+               partinfo = procmime_mimeinfo_next(partinfo);
+       }
+
+       g_free(prefs_common.attach_save_dir);
+       g_free(startdir);
+       prefs_common.attach_save_dir = g_strdup(dirname);
 }
 
+/**
+ * Menu callback: Save the selected attachment
+ * \param mimeview Current display
+ */
 static void mimeview_save_as(MimeView *mimeview)
 {
        gchar *filename;
-       gchar *defname = NULL;
+       gchar *filepath = NULL;
+       gchar *filedir = NULL;
        MimeInfo *partinfo;
-       gchar *res;
+       gchar *partname = NULL;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                        (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
+       
+       if (get_part_name(partinfo) == NULL) {
+               return;
+       }
+       partname = g_strdup(get_part_name(partinfo));
+       
+       if (!g_utf8_validate(partname, -1, NULL)) {
+               gchar *tmp = conv_filename_to_utf8(partname);
+               g_free(partname);
+               partname = tmp;
+       }
+
+       subst_for_filename(partname);
+       
+       if (prefs_common.attach_save_dir)
+               filepath = g_strconcat(prefs_common.attach_save_dir,
+                                      G_DIR_SEPARATOR_S, partname, NULL);
+       else
+               filepath = g_strdup(partname);
+
+       g_free(partname);
 
-       if (partinfo->filename)
-               defname = partinfo->filename;
-       else if (partinfo->name) {
-               Xstrdup_a(defname, partinfo->name, return);
-               subst_for_filename(defname);
+       filename = filesel_select_file_save(_("Save as"), filepath);
+       if (!filename) {
+               g_free(filepath);
+               return;
        }
 
-       filename = filesel_select_file(_("Save as"), defname);
-       if (!filename) return;
-       if (is_file_exist(filename)) {
-               AlertValue aval;
-               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-                                     filename);
-               aval = alertpanel(_("Overwrite"), res, _("OK"), 
-                                 _("Cancel"), NULL);
-               g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) return;
+       mimeview_write_part(filename, partinfo);
+
+       filedir = g_path_get_dirname(filename);
+       if (filedir && strcmp(filedir, ".")) {
+               g_free(prefs_common.attach_save_dir);
+               prefs_common.attach_save_dir = g_strdup(filedir);
        }
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
-               alertpanel_error
-                       (_("Can't save the part of multipart message."));
+       g_free(filedir);
+       g_free(filepath);
+}
+
+static void mimeview_display_as_text(MimeView *mimeview)
+{
+       MimeInfo *partinfo;
+
+       if (!mimeview->opened) return;
+
+       partinfo = mimeview_get_selected_part(mimeview);
+       if (!partinfo)  {
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
+       
+       }                        
+       g_return_if_fail(partinfo != NULL);
+       mimeview_show_message_part(mimeview, partinfo);
 }
 
 static void mimeview_launch(MimeView *mimeview)
@@ -1103,21 +1543,21 @@ static void mimeview_launch(MimeView *mimeview)
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
+       if (procmime_get_part(filename, partinfo) < 0)
                alertpanel_error
                        (_("Can't save the part of multipart message."));
        else
-               mimeview_view_file(filename, partinfo, NULL);
+               mimeview_view_file(filename, partinfo, NULL, mimeview);
 
        g_free(filename);
 }
@@ -1127,23 +1567,26 @@ static void mimeview_open_with(MimeView *mimeview)
        MimeInfo *partinfo;
        gchar *filename;
        gchar *cmd;
+       gchar *mime_command = NULL;
+       gchar *content_type = NULL;
 
+       if (!mimeview) return;
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) { 
-               partinfo = (MimeInfo *) gtk_object_get_data
-                       (GTK_OBJECT(mimeview->popupmenu),
+               partinfo = (MimeInfo *) g_object_get_data
+                       (G_OBJECT(mimeview->popupmenu),
                         "pop_partinfo");
-               gtk_object_set_data(GTK_OBJECT(mimeview->popupmenu),
-                                   "pop_partinfo", NULL);
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
-       if (procmime_get_part(filename, mimeview->file, partinfo) < 0) {
+       if (procmime_get_part(filename, partinfo) < 0) {
                alertpanel_error
                        (_("Can't save the part of multipart message."));
                g_free(filename);
@@ -1154,15 +1597,27 @@ static void mimeview_open_with(MimeView *mimeview)
                prefs_common.mime_open_cmd_history =
                        add_history(NULL, prefs_common.mime_open_cmd);
 
+       if ((partinfo->type == MIMETYPE_APPLICATION) &&
+            (!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
+               /* guess content-type from filename */
+               content_type = procmime_get_mime_type(filename);
+       } 
+       if (content_type == NULL) {
+               content_type = procmime_get_content_type_str(partinfo->type,
+                       partinfo->subtype);
+       }
+       mime_command = mailcap_get_command_for_type(content_type);
+       g_free(content_type);
        cmd = input_dialog_combo
                (_("Open with"),
                 _("Enter the command line to open file:\n"
-                  "(`%s' will be replaced with file name)"),
-                prefs_common.mime_open_cmd,
+                  "('%s' will be replaced with file name)"),
+                mime_command ? mime_command : prefs_common.mime_open_cmd,
                 prefs_common.mime_open_cmd_history,
                 TRUE);
+       g_free(mime_command);
        if (cmd) {
-               mimeview_view_file(filename, partinfo, cmd);
+               mimeview_view_file(filename, partinfo, cmd, mimeview);
                g_free(prefs_common.mime_open_cmd);
                prefs_common.mime_open_cmd = cmd;
                prefs_common.mime_open_cmd_history =
@@ -1173,12 +1628,12 @@ static void mimeview_open_with(MimeView *mimeview)
 }
 
 static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
-                              const gchar *cmdline)
+                              const gchar *cmdline, MimeView *mimeview)
 {
-       static gchar *default_image_cmdline = "display '%s'";
-       static gchar *default_audio_cmdline = "play '%s'";
+       static gchar *default_image_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
+       static gchar *default_audio_cmdline = DEFAULT_AUDIO_PLAYER_CMD;
        static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
-       static gchar *mime_cmdline = "metamail -d -b -x -c %s '%s'";
+       static gchar *mime_cmdline = DEFAULT_MIME_CMD;
        gchar buf[1024];
        gchar m_buf[1024];
        const gchar *cmd;
@@ -1188,20 +1643,26 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
        if (cmdline) {
                cmd = cmdline;
                def_cmd = NULL;
-       } else if (MIME_APPLICATION_OCTET_STREAM == partinfo->mime_type) {
+       } else if (MIMETYPE_APPLICATION == partinfo->type &&
+                  !g_ascii_strcasecmp(partinfo->subtype, "octet-stream")) {
+               mimeview_open_with(mimeview);
                return;
-       } else if (MIME_IMAGE == partinfo->mime_type) {
+       } else if (MIMETYPE_IMAGE == partinfo->type) {
                cmd = prefs_common.mime_image_viewer;
                def_cmd = default_image_cmdline;
-       } else if (MIME_AUDIO == partinfo->mime_type) {
+       } else if (MIMETYPE_AUDIO == partinfo->type) {
                cmd = prefs_common.mime_audio_player;
                def_cmd = default_audio_cmdline;
-       } else if (MIME_TEXT_HTML == partinfo->mime_type) {
+       } else if (MIMETYPE_TEXT == partinfo->type && !strcmp(partinfo->subtype, "html")) {
                cmd = prefs_common.uri_cmd;
                def_cmd = default_html_cmdline;
        } else {
+               gchar *content_type;
+               
+               content_type = procmime_get_content_type_str(partinfo->type, partinfo->subtype);
                g_snprintf(m_buf, sizeof(m_buf), mime_cmdline,
-                          partinfo->content_type, "%s");
+                          content_type, "%s");
+               g_free(content_type);
                cmd = m_buf;
                def_cmd = NULL;
        }
@@ -1211,87 +1672,18 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
                g_snprintf(buf, sizeof(buf), cmd, filename);
        else {
                if (cmd)
-                       g_warning("MIME viewer command line is invalid: `%s'", cmd);
+                       g_warning("MIME viewer command line is invalid: '%s'", cmd);
                if (def_cmd)
                        g_snprintf(buf, sizeof(buf), def_cmd, filename);
-               else
+               else {
+                       mimeview_open_with(mimeview);
                        return;
+               }
        }
 
-       execute_command_line(buf, TRUE);
-}
-
-#if USE_GPGME
-static void update_node_name(GtkCTree *ctree, GtkCTreeNode *node,
-                            gpointer data)
-{
-       MimeInfo *partinfo;
-       gchar *part_name;
-
-       partinfo = gtk_ctree_node_get_row_data(ctree, node);
-       g_return_if_fail(partinfo != NULL);
-
-       part_name = get_part_name(partinfo);
-       gtk_ctree_node_set_text(ctree, node, COL_NAME, part_name);
-}
-
-static void mimeview_update_names(MimeView *mimeview)
-{
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-
-       gtk_ctree_pre_recursive(ctree, NULL, update_node_name, NULL);
-}
-
-static void mimeview_update_signature_info(MimeView *mimeview)
-{
-       MimeInfo *partinfo;
-
-       if (!mimeview) return;
-       if (!mimeview->opened) return;
-
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo) return;
-
-       if (g_strcasecmp(partinfo->content_type,
-                        "application/pgp-signature") == 0) {
-               mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
-               textview_show_signature_part(mimeview->textview, partinfo);
-       }
-}
-
-void mimeview_check_signature(MimeView *mimeview)
-{
-       MimeInfo *mimeinfo;
-       FILE *fp;
-
-       g_return_if_fail (mimeview_is_signed(mimeview));
-       g_return_if_fail (gpg_started);
-
-       mimeinfo = gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
-       g_return_if_fail(mimeinfo != NULL);
-       g_return_if_fail(mimeview->file != NULL);
-
-       while (mimeinfo->parent)
-               mimeinfo = mimeinfo->parent;
-
-       if ((fp = fopen(mimeview->file, "rb")) == NULL) {
-               FILE_OP_ERROR(mimeview->file, "fopen");
-               return;
-       }
-
-       rfc2015_check_signature(mimeinfo, fp);
-       fclose(fp);
-
-       mimeview_update_names(mimeview);
-       mimeview_update_signature_info(mimeview);
-
-       textview_show_message(mimeview->messageview->textview, mimeinfo,
-                             mimeview->file);
-                             
-       mimeview_update(mimeview);
+       if (execute_command_line(buf, TRUE) != 0)
+               mimeview_open_with(mimeview);
 }
-#endif /* USE_GPGME */
 
 void mimeview_register_viewer_factory(MimeViewerFactory *factory)
 {
@@ -1331,50 +1723,36 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
        gint      num;
        MimeInfo *partinfo;
 
-       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
-       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
-       if (event->button == 1) { 
-               icon_selected(mimeview, num, partinfo);
-               gtk_widget_grab_focus(button);
-               
-               if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
-                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
-               else
-                       gtk_signal_emit_stop_by_name(GTK_OBJECT(button), "button_press_event");
-       }               
+       num      = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
+       partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
+
+       icon_selected(mimeview, num, partinfo);
+       gtk_widget_grab_focus(button);
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+               toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+               if (event->button == 2 || event->button == 3)
+                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
+                                                    TRUE);
+       }
 
        part_button_pressed(mimeview, event, partinfo);
 
-       return TRUE;
+       return FALSE;
 }
 
 static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
 {
-       if (num == 1 && (partinfo->mime_type == MIME_TEXT ||  
-                        partinfo->mime_type == MIME_TEXT_HTML))  {
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 0);
-               /* don't set the ctree, as it will unload the plugin, and
-                * we want to be able to switch quickly between the text
-                * part and the attachment */
-       } else {
-               GtkCTreeNode *node;
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1);
-               node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
-               if (node)
-                       gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
-       }
+       GtkCTreeNode *node;
+       node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+       if (node)
+               gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
 }              
 
-#warning FIXME_GTK2
-#if 0
 #undef  KEY_PRESS_EVENT_STOP
 #define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(button), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(button), \
-                                            "key_press_event"); \
-       }
-#endif
+        g_signal_stop_emission_by_name(G_OBJECT(button), \
+                                       "key_press_event");
+
 static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                             MimeView *mimeview)
 {
@@ -1383,15 +1761,12 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        SummaryView  *summaryview;
        TextView     *textview;
 
-       num      = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(button), "icon_number"));
-       partinfo = gtk_object_get_data(GTK_OBJECT(button), "partinfo");
+       num      = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
+       partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
        
        if (!event) return FALSE;
 
-       if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
-               textview = mimeview->messageview->textview;
-       else
-               textview = mimeview->textview;
+       textview = mimeview->textview;
 
        switch (event->keyval) {
        case GDK_space:
@@ -1428,40 +1803,46 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num + 1))
+               if (icon_list_select_by_number(mimeview, num + 1)) {
                        KEY_PRESS_EVENT_STOP();
                        return TRUE;
+               }
                break;
                
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num - 1))
+               if (icon_list_select_by_number(mimeview, num - 1)) {
                        KEY_PRESS_EVENT_STOP();
                        return TRUE;
+               }
                break;
 
        case GDK_y:
                BREAK_ON_MODIFIER_KEY();
-               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
-                       break;
                KEY_PRESS_EVENT_STOP();
                mimeview_save_as(mimeview);
                return TRUE;
        case GDK_t:
                BREAK_ON_MODIFIER_KEY();
-               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
-                       break;
                KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
                return TRUE;    
        case GDK_l:
                BREAK_ON_MODIFIER_KEY();
-               if (gtk_notebook_get_current_page(GTK_NOTEBOOK(mimeview->notebook)) == 0)
-                       break;
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview);
                return TRUE;
+       case GDK_o:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_open_with(mimeview);
+               return TRUE;
+       case GDK_c:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_check_signature(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -1489,71 +1870,97 @@ static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
 
 static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo) 
 {
-       GtkWidget *pixmap;
+       GtkWidget *pixmap = NULL;
        GtkWidget *vbox;
        GtkWidget *button;
        gchar *tip;
-       gchar *desc = NULL;
+       gchar *tiptmp;
+       const gchar *desc = NULL; 
+       gchar *sigshort = NULL;
+       gchar *content_type;
        StockPixmap stockp;
+       MimeInfo *partinfo;
+       MimeInfo *siginfo = NULL;
+       MimeInfo *encrypted = NULL;
        
        vbox = mimeview->icon_vbox;
        mimeview->icon_count++;
        button = gtk_toggle_button_new();
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-       gtk_object_set_data(GTK_OBJECT(button), "icon_number", 
-               GINT_TO_POINTER(mimeview->icon_count));
-       gtk_object_set_data(GTK_OBJECT(button), "partinfo", 
-               mimeinfo);
+       g_object_set_data(G_OBJECT(button), "icon_number", 
+                         GINT_TO_POINTER(mimeview->icon_count));
+       g_object_set_data(G_OBJECT(button), "partinfo", 
+                         mimeinfo);
        
-       switch (mimeinfo->mime_type) {
+       switch (mimeinfo->type) {
                
-       case MIME_TEXT:
-       case MIME_MESSAGE_RFC822:
-               stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
-               break;
-       case MIME_TEXT_HTML:
-               stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
+       case MIMETYPE_TEXT:
+               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "html"))
+                       stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
+               else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "enriched"))
+                       stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
+               else
+                       stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
                break;
-       case MIME_APPLICATION:
-#ifdef USE_GPGME       
-               if (mimeinfo->content_type
-                       &&  g_strcasecmp(mimeinfo->content_type, 
-                                        "application/pgp-signature")  == 0) {
-                       if (mimeinfo->sigstatus_full) {
-                               desc = mimeinfo->sigstatus;
-                               if (mimeinfo->sig_ok)
-                                       stockp = STOCK_PIXMAP_MIME_GPG_PASSED;
-                               else if (mimeinfo->sig_unknown) 
-                                       stockp = STOCK_PIXMAP_MIME_GPG_UNKNOWN;
-                               else if (mimeinfo->sig_expired 
-                                        || mimeinfo->key_expired) 
-                                       stockp = STOCK_PIXMAP_MIME_GPG_EXPIRED;
-                               else
-                                       stockp = STOCK_PIXMAP_MIME_GPG_FAILED;
-                       } else
-                               stockp = STOCK_PIXMAP_MIME_GPG_SIGNED;
-               } else
-#endif 
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
+       case MIMETYPE_MESSAGE:
+               stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
-       case MIME_APPLICATION_OCTET_STREAM:
-               stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
+       case MIMETYPE_APPLICATION:
+               stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
-       case MIME_IMAGE:
+       case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;
                break;
-       case MIME_AUDIO:
+       case MIMETYPE_AUDIO:
                stockp = STOCK_PIXMAP_MIME_AUDIO;
                break;
-       case MIME_TEXT_ENRICHED:
-               stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
-               break;
        default:
                stockp = STOCK_PIXMAP_MIME_UNKNOWN;
                break;
        }
        
-       pixmap = stock_pixmap_widget(mimeview->mainwin->window, stockp);
+       partinfo = mimeinfo;
+       while (partinfo != NULL) {
+               if (privacy_mimeinfo_is_signed(partinfo)) {
+                       siginfo = partinfo;
+                       break;
+               }
+               if (privacy_mimeinfo_is_encrypted(partinfo)) {
+                       encrypted = partinfo;
+                       break;
+               }
+               partinfo = procmime_mimeinfo_parent(partinfo);
+       }       
+
+       if (siginfo != NULL) {
+               switch (privacy_mimeinfo_get_sig_status(siginfo)) {
+               case SIGNATURE_UNCHECKED:
+               case SIGNATURE_CHECK_FAILED:
+               case SIGNATURE_CHECK_TIMEOUT:
+                       pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+                           STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+                       break;
+               case SIGNATURE_OK:
+                       pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+                           STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+                       break;
+               case SIGNATURE_WARN:
+                       pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+                           STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
+                       break;
+               case SIGNATURE_INVALID:
+                       pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+                           STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+                       break;
+               }
+               sigshort = privacy_mimeinfo_sig_info_short(siginfo);
+       } else if (encrypted != NULL) {
+                       pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+                           STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);         
+       } else {
+               pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp, 0,
+                                                         OVERLAY_NONE, 6, 3);
+       }
        gtk_container_add(GTK_CONTAINER(button), pixmap);
        
        if (!desc) {
@@ -1562,20 +1969,43 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                else
                        desc = get_part_name(mimeinfo);
        }
-       if (desc && *desc)
-               tip = g_strdup_printf("%s\n%s\n%s", desc, mimeinfo->content_type, 
-                               to_human_readable(mimeinfo->size));
-       else            
-               tip = g_strdup_printf("%s\n%s", mimeinfo->content_type, 
-                               to_human_readable(mimeinfo->size));
+
+       content_type = procmime_get_content_type_str(mimeinfo->type,
+                                                    mimeinfo->subtype);
+
+       tip = g_strjoin("\n", content_type,
+                       to_human_readable(mimeinfo->length), NULL);
+       g_free(content_type);
+       if (desc && *desc) {
+               gchar *tmp = NULL;
+               if (!g_utf8_validate(desc, -1, NULL)) {
+                       tmp = conv_filename_to_utf8(desc);
+               } else {
+                       tmp = g_strdup(desc);
+               }
+               tiptmp = g_strjoin("\n", tmp, tip, NULL);
+               g_free(tip);
+               tip = tiptmp;
+               g_free(tmp);
+       }
+       if (sigshort && *sigshort) {
+               tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+               g_free(tip);
+               tip = tiptmp;
+       }
+       g_free(sigshort);
 
        gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
        g_free(tip);
        gtk_widget_show_all(button);
-       g_signal_connect(G_OBJECT(button), "button_press_event", 
+       gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
+                           mimeview_mime_types, 1, GDK_ACTION_COPY);
+       g_signal_connect(G_OBJECT(button), "button_release_event", 
                         G_CALLBACK(icon_clicked_cb), mimeview);
        g_signal_connect(G_OBJECT(button), "key_press_event", 
                         G_CALLBACK(icon_key_pressed), mimeview);
+       g_signal_connect(G_OBJECT(button), "drag_data_get",
+                        G_CALLBACK(mimeview_drag_data_get), mimeview);
        gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
 
 }
@@ -1592,8 +2022,7 @@ static void icon_list_clear (MimeView *mimeview)
        }
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
-       adj->value = adj->lower;
-       gtk_signal_emit_by_name(GTK_OBJECT (adj), "value_changed");
+       gtk_adjustment_set_value(adj, adj->lower);
 }
 
 static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
@@ -1604,8 +2033,8 @@ static void icon_list_toggle_by_mime_info(MimeView        *mimeview,
        child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   gtk_object_get_data(GTK_OBJECT(child->data),
-                                       "partinfo") == (gpointer)mimeinfo) {
+                   g_object_get_data(G_OBJECT(child->data),
+                                     "partinfo") == (gpointer)mimeinfo) {
                        toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(child->data), TRUE);
@@ -1627,11 +2056,11 @@ static gboolean icon_list_select_by_number(MimeView     *mimeview,
        child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(child->data),
+                   GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child->data),
                                        "icon_number")) == number) {
                        icon_selected(mimeview, number,
-                                     (MimeInfo*)gtk_object_get_data(GTK_OBJECT(child->data),
-                                                                    "partinfo"));
+                                     (MimeInfo*)g_object_get_data(G_OBJECT(child->data),
+                                                                  "partinfo"));
                        toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(child->data), TRUE);
@@ -1644,7 +2073,7 @@ static gboolean icon_list_select_by_number(MimeView       *mimeview,
 }
 
 static void icon_scroll_size_allocate_cb(GtkWidget *widget, 
-                                       GtkAllocation *size, MimeView *mimeview)
+                                        GtkAllocation *size, MimeView *mimeview)
 {
        GtkAllocation *mainbox_size;
        GtkAllocation *vbox_size;
@@ -1656,11 +2085,7 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
        mainbox_size = &mimeview->icon_mainbox->allocation;
        vbox_size = &mimeview->icon_vbox->allocation;
        layout_size = &mimeview->icon_scroll->allocation;
-       
-       /* centralise the vbox */
-       gtk_layout_move(GTK_LAYOUT(mimeview->icon_scroll), mimeview->icon_vbox, 
-                       (mainbox_size->width - vbox_size->width)/2, 0);
-       
+               
        gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll), 
                            GTK_LAYOUT(mimeview->icon_scroll)->width, 
                            MAX(vbox_size->height, layout_size->height));
@@ -1670,28 +2095,23 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
 static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkRequisition size;
-       gint           width;
-       g_return_if_fail(mimeinfo != NULL);
 
-       if (mimeinfo->children)
-               mimeinfo = mimeinfo->children;
+       g_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
-               if (mimeinfo->children)
-                       icon_list_create(mimeview, mimeinfo);
-               else if (mimeinfo->sub &&
-                        mimeinfo->sub->mime_type != MIME_TEXT &&
-                        mimeinfo->sub->mime_type != MIME_TEXT_HTML)
-                       icon_list_create(mimeview, mimeinfo->sub);
-               else 
+               if (mimeinfo->type != MIMETYPE_MULTIPART)
                        icon_list_append_icon(mimeview, mimeinfo);
-               mimeinfo = mimeinfo->next;
+               if (mimeinfo->node->children != NULL)
+                       icon_list_create(mimeview, 
+                               (MimeInfo *) mimeinfo->node->children->data);
+               mimeinfo = mimeinfo->node->next != NULL 
+                        ? (MimeInfo *) mimeinfo->node->next->data 
+                        : NULL;
        }
        gtk_widget_size_request(mimeview->icon_vbox, &size);
-       width = size.width + 4;
-       if (width > mimeview->icon_mainbox->requisition.width) {
+       if (size.width > mimeview->icon_mainbox->requisition.width) {
                gtk_widget_set_size_request(mimeview->icon_mainbox, 
-                                           width, -1);
+                                           size.width, -1);
        }
 
 }
@@ -1711,7 +2131,7 @@ static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
                                        button);
                gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox), 
                                   button, FALSE, FALSE, 0);
-               gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->notebook), 1); 
+               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 6);
        } else {
                gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT, 
                              GTK_SHADOW_NONE);
@@ -1730,6 +2150,7 @@ static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
                                (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree), 
                                                                       mimeview->opened));
 
+               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
        }
        gtk_widget_grab_focus(button);
        gtk_widget_unref(button);
@@ -1742,3 +2163,32 @@ void mimeview_update (MimeView *mimeview) {
                icon_list_create(mimeview, mimeview->mimeinfo);
        }
 }
+
+void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd)
+{
+       MessageView *msgview = NULL;
+       MainWindow *mainwin = NULL;
+       
+       if (!cmd)
+               return;
+       
+       msgview = mimeview->messageview;
+       if (!msgview)
+               return;
+               
+       mainwin = msgview->mainwin;
+       if (!mainwin)
+               return;
+               
+       else if (!strcmp(cmd, "sc://view_log"))
+               log_window_show(mainwin->logwin);
+       else if (!strcmp(cmd, "sc://save_as"))
+               mimeview_save_as(mimeview);
+       else if (!strcmp(cmd, "sc://display_as_text"))
+               mimeview_display_as_text(mimeview);
+       else if (!strcmp(cmd, "sc://open_with"))
+               mimeview_open_with(mimeview);
+       else if (!strcmp(cmd, "sc://open"))
+               mimeview_launch(mimeview);
+}
+