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[] =
{
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");
procmime_scan_multipart_message(mimeinfo, fp);
#if USE_GPGME
- if (prefs_common.auto_check_signatures)
+ if ((prefs_common.auto_check_signatures)
+ && (gpg_started))
rfc2015_check_signature(mimeinfo, fp);
else
set_unchecked_signature(mimeinfo);
return partinfo->name;
else if (partinfo->filename)
return partinfo->filename;
+ else if (partinfo->description)
+ return partinfo->description;
+ else
+ return "";
+}
+
+static 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 "";
}
str[COL_MIMETYPE] =
partinfo->content_type ? partinfo->content_type : "";
str[COL_SIZE] = to_human_readable(partinfo->size);
- str[COL_NAME] = get_part_name(partinfo);
+ if (prefs_common.attach_desc)
+ str[COL_NAME] = get_part_description(partinfo);
+ else
+ str[COL_NAME] = get_part_name(partinfo);
node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
NULL, NULL, NULL, NULL,
/* Workaround for the GTK+ bug with handling scroll adjustments
* in GtkViewport */
imageview_clear(mimeview->imageview);
- imageview_show_image(mimeview->imageview, partinfo, filename);
+ imageview_show_image(mimeview->imageview, partinfo, filename,
+ prefs_common.resize_image);
unlink(filename);
}
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 */
+ if (!partinfo->parent->children) return; /* multipart container? */
attachment = partinfo->parent->children->next;
-
/* for each attachment, extract it in the selected dir. */
- while(attachment != NULL)
- {
- if(attachment->filename)
- {
- gchar *attachname = g_strdup(attachment->filename);
-
- 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 );
- g_free(attachname);
- make_dir_hier(g_dirname(buf));
-
- 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."));
+ 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);
}
+ g_free(attachname);
+ 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;
}
}
gchar *filename;
gchar *defname = NULL;
MimeInfo *partinfo;
+ gchar *res;
if (!mimeview->opened) return;
if (!mimeview->file) return;
if (!filename) return;
if (is_file_exist(filename)) {
AlertValue aval;
-
- aval = alertpanel(_("Overwrite"),
- _("Overwrite existing file?"),
- _("OK"), _("Cancel"), NULL);
+ res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+ filename);
+ aval = alertpanel(_("Overwrite"), res, _("OK"),
+ _("Cancel"), NULL);
+ g_free(res);
if (G_ALERTDEFAULT != aval) return;
}
{
static gchar *default_image_cmdline = "display '%s'";
static gchar *default_audio_cmdline = "play '%s'";
- static gchar *default_html_cmdline =
- "netscape -remote 'openURL(%s,raise)'";
+ static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
static gchar *mime_cmdline = "metamail -d -b -x -c %s '%s'";
gchar buf[1024];
gchar m_buf[1024];
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
}
}
-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));
+ g_return_if_fail (gpg_started);
mimeinfo = gtk_ctree_node_get_row_data
(GTK_CTREE(mimeview->ctree), mimeview->opened);
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 */
projects / claws.git / blobdiff