0.9.6claws72
[claws.git] / src / mimeview.c
index c5d073f020d3c61af8dabc8682bcb974444cbdbf..937277d2b9cd130662d9041ec38412153159d42e 100644 (file)
@@ -347,8 +347,6 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
                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);
        }
 }
 
@@ -617,42 +615,42 @@ void mimeview_clear(MimeView *mimeview)
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 
 static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        if (privacy_mimeinfo_is_signed(mimeinfo)) {
                gchar *text = NULL, *button_text = NULL;
                GtkSignalFunc func = NULL;
-               StockPixmap icon;
+               StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
                
                switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
                case SIGNATURE_UNCHECKED:
-                       text = _("This part of the message has been signed");
                        button_text = _("Check");
                        func = check_signature_cb;
                        icon = STOCK_PIXMAP_PRIVACY_SIGNED;
                        break;
                case SIGNATURE_OK:
-                       text = _("Signature is valid");
+                       button_text = _("Full info");
+                       func = display_full_info_cb;
                        icon = STOCK_PIXMAP_PRIVACY_PASSED;
                        break;
                case SIGNATURE_WARN:
-                       text = _("Signature is ok");
                        icon = STOCK_PIXMAP_PRIVACY_WARN;
                        break;
                case SIGNATURE_INVALID:
-                       text = _("The signature of this part is invalid");
                        icon = STOCK_PIXMAP_PRIVACY_FAILED;
                        break;
                case SIGNATURE_CHECK_FAILED:
-                       text = _("Signature check failed");
                        button_text = _("Check again");
                        func = check_signature_cb;
                        icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
                default:
                        break;
                }
+               text = privacy_mimeinfo_sig_info_short(mimeinfo);
                noticeview_set_text(mimeview->siginfoview, text);
+               g_free(text);
                noticeview_set_button_text(mimeview->siginfoview, button_text);
                noticeview_set_button_press_callback(
                        mimeview->siginfoview,
@@ -674,6 +672,17 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        update_signature_noticeview(mimeview, mimeinfo);
 }
 
+static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
+{
+       MimeView *mimeview = (MimeView *) user_data;
+       MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
+       gchar *siginfo;
+       
+       siginfo = privacy_mimeinfo_sig_info_full(mimeinfo);
+       textview_set_text(mimeview->textview, siginfo);
+       g_free(siginfo);
+}
+
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                              MimeView *mimeview)
 {
@@ -913,15 +922,14 @@ 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 = mimeview_get_selected_part(mimeview);
-       g_return_if_fail(partinfo != NULL);
+       attachment = mimeview->mimeinfo;
+       g_return_if_fail(attachment != NULL);
 
        dirname = filesel_select_file(_("Save as"), defname);
        if (!dirname) return;
@@ -944,43 +952,44 @@ static void mimeview_save_all(MimeView *mimeview)
                }
        }
 
-       /* return to first children */
-       if (partinfo->node->parent->children == NULL) return;  /* multipart container? */
-       attachment = partinfo->node->parent->children->next != NULL ?
-           (MimeInfo *) partinfo->node->parent->children->next->data : NULL;
        /* 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;
-
-               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);                                      
+               if (attachment->type != MIMETYPE_MESSAGE &&
+                   attachment->type != MIMETYPE_MULTIPART &&
+                   (procmime_mimeinfo_get_parameter(attachment, "name") ||
+                    procmime_mimeinfo_get_parameter(attachment, "filename"))) {
+                       static guint subst_cnt = 1;
+                       gchar *attachdir;
+                       gchar *attachname = g_strdup(get_part_name(attachment));
+                       AlertValue aval = G_ALERTDEFAULT;
+                       gchar *res;
+
+                       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);
+                       
+                       if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
+                               alertpanel_error(_("Can't save the part of multipart message."));
                }
-               g_free(attachname);
-
-               if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
-                       alertpanel_error(_("Can't save the part of multipart message."));
-               attachment = attachment->node->next != NULL ? (MimeInfo *) attachment->node->next->data : NULL;
+               attachment = procmime_mimeinfo_next(attachment);
        }
 }
 
@@ -1009,6 +1018,7 @@ static void mimeview_save_as(MimeView *mimeview)
        gchar *defname = NULL;
        MimeInfo *partinfo;
        gchar *res;
+       const gchar *partname = NULL;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
@@ -1022,11 +1032,9 @@ static void mimeview_save_as(MimeView *mimeview)
                                    "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
-
-       if (partinfo->filename)
-               defname = partinfo->filename;
-       else if (partinfo->name) {
-               Xstrdup_a(defname, partinfo->name, return);
+       
+       if (partname = procmime_mimeinfo_get_parameter(partinfo, "name")) {
+               Xstrdup_a(defname, partname, return);
                subst_for_filename(defname);
        }
 
@@ -1219,15 +1227,17 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
 
        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");
-       }               
+
+       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);
+       } else {
+               gtk_signal_emit_stop_by_name(GTK_OBJECT(button), "button_press_event");
+       }
 
        part_button_pressed(mimeview, event, partinfo);
 
@@ -1386,10 +1396,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "octet-stream"))
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
-               else
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
        case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;