diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2013-05-31 17:16:44 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2013-05-31 17:16:44 -0600 |
| commit | a46157ba61f2c65f88b42abb31db60c4a714f87b (patch) | |
| tree | e37bc41ad2f57b3fd2bad310576cc155a58ca6b7 /alpine/mailpart.c | |
| parent | 81e994d7907f850506ddc248f84761a54995e58c (diff) | |
| download | alpine-a46157ba61f2c65f88b42abb31db60c4a714f87b.tar.xz | |
* somehow all.patch got here. Reversing.
Diffstat (limited to 'alpine/mailpart.c')
| -rw-r--r-- | alpine/mailpart.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/alpine/mailpart.c b/alpine/mailpart.c index 63427744..8286d79d 100644 --- a/alpine/mailpart.c +++ b/alpine/mailpart.c @@ -2146,11 +2146,6 @@ display_attachment(long int msgno, ATTACH_S *a, int flags) return(1); } - /* ok, we have a filename. Now check if there is a template, and if - * so, rename the file accordingly - */ - filename = mc_template(filename, a->body, a->can_display & MCD_EXT_PROMPT); - if((store = so_get(FileStar, filename, WRITE_ACCESS|OWNER_ONLY)) == NULL){ q_status_message2(SM_ORDER | SM_DING, 3, 5, _("Error \"%s\", Can't write file %s"), @@ -3313,7 +3308,7 @@ reply_msg_att(MAILSTREAM *stream, long int msgno, ATTACH_S *a) /* * For consistency, the first question is always "include text?" */ - if((include_text = reply_text_query(ps_global, 1, NULL, &prefix)) >= 0 + if((include_text = reply_text_query(ps_global, 1, &prefix)) >= 0 && reply_news_test(a->body->nested.msg->env, outgoing) > 0 && reply_harvest(ps_global, msgno, a->number, a->body->nested.msg->env, &saved_from, |