while (mimeinfo != NULL) {
node = mimeview_append_part(mimeview, mimeinfo, parent);
- if (mimeinfo->children)
- mimeview_set_multipart_tree(mimeview, mimeinfo->children, 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;
}
}
icon_list_clear(mimeview);
}
+static void check_signature_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;
+
+ switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
+ case SIGNATURE_UNCHECKED:
+ button_text = _("Check");
+ func = check_signature_cb;
+ icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+ break;
+ case SIGNATURE_OK:
+ icon = STOCK_PIXMAP_PRIVACY_PASSED;
+ break;
+ case SIGNATURE_WARN:
+ icon = STOCK_PIXMAP_PRIVACY_WARN;
+ break;
+ case SIGNATURE_INVALID:
+ icon = STOCK_PIXMAP_PRIVACY_FAILED;
+ break;
+ case 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,
+ func,
+ (gpointer) mimeview);
+ noticeview_set_icon(mimeview->siginfoview, icon);
+ noticeview_show(mimeview->siginfoview);
+ } else {
+ noticeview_hide(mimeview->siginfoview);
+ }
+}
+
+static void check_signature_cb(GtkWidget *widget, gpointer user_data)
+{
+ MimeView *mimeview = (MimeView *) user_data;
+ MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
+
+ privacy_mimeinfo_check_signature(mimeinfo);
+ update_signature_noticeview(mimeview, mimeinfo);
+}
+
static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
MimeView *mimeview)
{
mimeview->textview->default_text = FALSE;
- if (privacy_mimeinfo_is_signed(partinfo)) {
- noticeview_set_text(mimeview->siginfoview, "Signed Part");
- noticeview_show(mimeview->siginfoview);
- } else {
- noticeview_hide(mimeview->siginfoview);
- }
+ update_signature_noticeview(mimeview, partinfo);
if (!mimeview_show_part(mimeview, partinfo)) {
switch (partinfo->type) {
}
/* return to first children */
- if (!partinfo->parent->children) return; /* multipart container? */
- attachment = partinfo->parent->children->next;
+ 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;
if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
alertpanel_error(_("Can't save the part of multipart message."));
- attachment = attachment->next;
+ attachment = attachment->node->next != NULL ? (MimeInfo *) attachment->node->next->data : NULL;
}
}
gchar *defname = NULL;
MimeInfo *partinfo;
gchar *res;
+ const gchar *partname = NULL;
if (!mimeview->opened) return;
if (!mimeview->file) return;
"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);
}
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;
while (mimeinfo != NULL) {
if (mimeinfo->type != MIMETYPE_MULTIPART)
icon_list_append_icon(mimeview, mimeinfo);
- if (mimeinfo->children != NULL)
- icon_list_create(mimeview, mimeinfo->children);
- 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;