Made GPG signatures verifiable by clicking the
[claws.git] / src / mimeview.c
index 76f8de16982bee2604489ed871b349db00898a51..65b8f701b3da759dfa98b2ac7e9a2bb09ff9ac4e 100644 (file)
@@ -100,22 +100,23 @@ static void mimeview_drag_data_get      (GtkWidget          *widget,
                                         MimeView         *mimeview);
 
 static void mimeview_display_as_text   (MimeView       *mimeview);
+static void mimeview_show_image                (MimeView       *mimeview);
 static void mimeview_save_as           (MimeView       *mimeview);
+static void mimeview_save_all          (MimeView       *mimeview);
 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);
-#if USE_GPGME
-static void mimeview_check_signature   (MimeView       *mimeview);
-#endif
 
 static GtkItemFactoryEntry mimeview_popup_entries[] =
 {
        {N_("/_Open"),            NULL, mimeview_launch,          0, NULL},
        {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_("/_Display image"),   NULL, mimeview_show_image,      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}
@@ -143,7 +144,7 @@ MimeView *mimeview_create(void)
        gint n_entries;
        gint i;
 
-       debug_print(_("Creating MIME view...\n"));
+       debug_print("Creating MIME view...\n");
        mimeview = g_new0(MimeView, 1);
 
        titles[COL_MIMETYPE] = _("MIME Type");
@@ -359,6 +360,12 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
 
        if (!mimeinfo->sub && mimeinfo->parent)
                current = mimeview_append_part(mimeview, mimeinfo, parent);
+       if (mimeinfo->sub && !mimeinfo->sub->children &&
+           mimeinfo->sub->mime_type != MIME_TEXT &&
+           mimeinfo->sub->mime_type != MIME_TEXT_HTML) {
+               mimeview_append_part(mimeview, mimeinfo->sub, parent);
+               return;
+       }
 
        if (mimeinfo->sub)
                mimeview_set_multipart_tree(mimeview, mimeinfo->sub, current);
@@ -533,7 +540,9 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                if (gdk_pointer_is_grabbed())
                        gdk_pointer_ungrab(GDK_CURRENT_TIME);
        }
-
+       
+       mimeview->textview->default_text = FALSE;
+       
        switch (partinfo->mime_type) {
        case MIME_TEXT:
        case MIME_TEXT_HTML:
@@ -541,13 +550,21 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        case MIME_MESSAGE_RFC822:
        case MIME_MULTIPART:
                mimeview_show_message_part(mimeview, partinfo);
+               
                break;
 #if (HAVE_GDK_PIXBUF || HAVE_GDK_IMLIB)
        case MIME_IMAGE:
-               mimeview_show_image_part(mimeview, partinfo);
+               mimeview->textview->default_text = TRUE;        
+               if (prefs_common.display_img)
+                       mimeview_show_image_part(mimeview, partinfo);
+               else {
+                       mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+                       textview_show_mime_part(mimeview->textview, partinfo);
+               }
                break;
 #endif
        default:
+               mimeview->textview->default_text = TRUE;        
                mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
 #if USE_GPGME
                if (g_strcasecmp(partinfo->content_type,
@@ -623,6 +640,12 @@ static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Open", TRUE);
+
+#if (HAVE_GDK_PIXBUF || HAVE_GDK_IMLIB)
+               if (partinfo && (partinfo->mime_type == MIME_IMAGE))
+                       menu_set_sensitive(mimeview->popupfactory,
+                                          "/Display image", TRUE);
+#endif                                    
 #if USE_GPGME
                menu_set_sensitive(mimeview->popupfactory,
                                   "/Check signature",
@@ -708,6 +731,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
+               return TRUE;    
+       case GDK_i:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_show_image(mimeview);
                return TRUE;
        case GDK_l:
                BREAK_ON_MODIFIER_KEY();
@@ -761,6 +789,61 @@ static void mimeview_drag_data_get(GtkWidget           *widget,
        g_free(filename);
 }
 
+static void mimeview_save_all(MimeView *mimeview)
+{
+       gchar *dirname;
+       gchar *defname = NULL;
+       MimeInfo *partinfo;
+       MimeInfo *attachment;
+       gchar buf[1024];
+
+       if (!mimeview->opened) return;
+       if (!mimeview->file) return;
+
+       partinfo = gtk_ctree_node_get_row_data
+               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       g_return_if_fail(partinfo != NULL);
+
+       dirname = filesel_select_file(_("Save as"), defname);
+       if (!dirname) return;
+
+       /* return to first children */
+       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 = (attachment->filename)
+                       ? g_strdup(attachment->filename)
+                       : g_strdup_printf("noname.%d",subst_cnt++);
+
+               subst_chars(attachname, "/\\", G_DIR_SEPARATOR);
+               subst_chars(attachname, ":?*&|<>\t\r\n", '_');
+               g_snprintf(buf, sizeof(buf), "%s%s",
+                          dirname,
+                          (attachname[0] == G_DIR_SEPARATOR)
+                          ? &attachname[1]
+                          : attachname);
+               attachdir = g_dirname(buf);
+               make_dir_hier(attachdir);
+               g_free(attachdir);
+               g_free(attachname);
+
+               if (is_file_exist(buf)) {
+                       AlertValue aval;
+
+                       aval = alertpanel(_("Overwrite"),
+                                         _("Overwrite existing file?"),
+                                         _("OK"), _("Cancel"), NULL);
+                       if (G_ALERTDEFAULT != aval) return;
+               }
+               if (procmime_get_part(buf, mimeview->file, attachment) < 0)
+                       alertpanel_error(_("Can't save the part of multipart message."));
+               attachment = attachment->next;
+       }
+}
+
 static void mimeview_display_as_text(MimeView *mimeview)
 {
        MimeInfo *partinfo;
@@ -772,6 +855,17 @@ static void mimeview_display_as_text(MimeView *mimeview)
        mimeview_show_message_part(mimeview, partinfo);
 }
 
+static void mimeview_show_image(MimeView *mimeview)
+{
+       MimeInfo *partinfo;
+
+       if (!mimeview->opened) return;
+
+       partinfo = gtk_ctree_node_get_row_data
+               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       mimeview_show_image_part(mimeview, partinfo);
+}
+
 static void mimeview_save_as(MimeView *mimeview)
 {
        gchar *filename;
@@ -964,10 +1058,9 @@ static void mimeview_update_signature_info(MimeView *mimeview)
        }
 }
 
-static void mimeview_check_signature(MimeView *mimeview)
+void mimeview_check_signature(MimeView *mimeview)
 {
        MimeInfo *mimeinfo;
-       gchar buf[BUFFSIZE];
        FILE *fp;
 
        g_return_if_fail (mimeview_is_signed(mimeview));
@@ -985,19 +1078,13 @@ static void mimeview_check_signature(MimeView *mimeview)
                return;
        }
 
-       /* skip headers */
-       if (mimeinfo->mime_type == MIME_MULTIPART) {
-               if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
-               FILE_OP_ERROR(mimeview->file, "fseek");
-               while (fgets(buf, sizeof(buf), fp) != NULL)
-                       if (buf[0] == '\r' || buf[0] == '\n') break;
-       }
-
-       procmime_scan_multipart_message(mimeinfo, fp);
        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);
 }
 #endif /* USE_GPGME */