diff -rc alpine-1.00.orig/alpine/send.c alpine-1.00.new/alpine/send.c *** alpine-1.00.orig/alpine/send.c 2007-12-05 17:50:54.000000000 +0000 --- alpine-1.00.new/alpine/send.c 2007-12-23 09:05:10.000000000 +0000 *************** *** 86,91 **** --- 86,92 ---- REDRAFT_POS_S **, PINEFIELD **, ACTION_S **, int); int redraft_prompt(char *, char *, int); int check_for_subject(METAENV *); + int check_for_fcc(char *); void free_prompts(PINEFIELD *); int postpone_prompt(void); METAENV *pine_simple_send_header(ENVELOPE *, char **, char ***); *************** *** 171,177 **** /* ! * For check_for_subject */ #define CF_OK 0x1 #define CF_MISSING 0x2 --- 172,178 ---- /* ! * For check_for_subject and check_for_fcc */ #define CF_OK 0x1 #define CF_MISSING 0x2 *************** *** 3653,3658 **** --- 3654,3672 ---- continue; } + if(F_ON(F_WARN_ABOUT_NO_FCC, ps_global) + && check_for_fcc(fcc) == CF_MISSING){ + dprint((4, "No Fcc, continuing\n")); + if(local_redraft_pos && local_redraft_pos != redraft_pos) + free_redraft_pos(&local_redraft_pos); + + local_redraft_pos + = (REDRAFT_POS_S *) fs_get(sizeof(*local_redraft_pos)); + memset((void *) local_redraft_pos,0,sizeof(*local_redraft_pos)); + local_redraft_pos->hdrname = cpystr("Fcc"); + continue; + } + set_last_fcc(fcc); /*---- Check out fcc -----*/ *************** *** 4061,4066 **** --- 4075,4103 ---- /* + * Check for fcc in outgoing message. + * + * Asks user whether to proceed with no fcc. + */ + int + check_for_fcc(char *fcc) + { + int rv = CF_OK; + + if (fcc && *fcc) { + rv = CF_OK; + } else { + if(want_to("No Fcc, send anyway ", + 'n', 'n', h_send_check_fcc, WT_NORM) == 'y') + rv = CF_OK; + else + rv = CF_MISSING; + } + return(rv); + } + + + /* * Confirm that the user wants to send to MAILER-DAEMON */ int Only in alpine-1.00.new/: confdefs.h Only in alpine-1.00.new/: conftest.dir Only in alpine-1.00.new/imap: ip6 diff -rc alpine-1.00.orig/pith/conf.c alpine-1.00.new/pith/conf.c *** alpine-1.00.orig/pith/conf.c 2007-12-13 19:31:13.000000000 +0000 --- alpine-1.00.new/pith/conf.c 2007-12-23 07:07:27.000000000 +0000 *************** *** 2780,2785 **** --- 2780,2787 ---- F_STRIP_WS_BEFORE_SEND, h_config_strip_ws_before_send, PREF_SEND, 0}, {"warn-if-blank-subject", "Warn if Blank Subject", F_WARN_ABOUT_NO_SUBJECT, h_config_warn_if_subj_blank, PREF_SEND, 0}, + {"warn-if-blank-fcc", "Warn if Blank Fcc", + F_WARN_ABOUT_NO_FCC, h_config_warn_if_fcc_blank, PREF_SEND, 0}, {"warn-if-blank-to-and-cc-and-newsgroups", "Warn if Blank To and CC and Newsgroups", F_WARN_ABOUT_NO_TO_OR_CC, h_config_warn_if_no_to_or_cc, PREF_SEND, 0}, diff -rc alpine-1.00.orig/pith/conftype.h alpine-1.00.new/pith/conftype.h *** alpine-1.00.orig/pith/conftype.h 2007-11-08 01:14:02.000000000 +0000 --- alpine-1.00.new/pith/conftype.h 2007-12-23 06:53:32.000000000 +0000 *************** *** 389,394 **** --- 389,395 ---- F_TAB_TO_NEW, F_MARK_FOR_CC, F_WARN_ABOUT_NO_SUBJECT, + F_WARN_ABOUT_NO_FCC, F_WARN_ABOUT_NO_TO_OR_CC, F_QUELL_DEAD_LETTER, F_QUELL_BEEPS, diff -rc alpine-1.00.orig/pith/pine.hlp alpine-1.00.new/pith/pine.hlp *** alpine-1.00.orig/pith/pine.hlp 2007-12-20 16:34:31.000000000 +0000 --- alpine-1.00.new/pith/pine.hlp 2007-12-23 08:27:58.000000000 +0000 *************** *** 3054,3059 **** --- 3054,3060 ----
  • FEATURE: Use System Translation
  • FEATURE:
  • FEATURE: +
  • FEATURE:
  • FEATURE:
  • Filtering
  • Finding more information and requesting help *************** *** 32334,32339 **** --- 32335,32361 ---- <End of help on this topic> + ====== h_config_warn_if_fcc_blank ===== + + + FEATURE: <!--#echo var="FEAT_warn-if-blank-fcc"--> + + +

    FEATURE:

    + + This feature affects Alpine's behavior when you send a message being + composed. + If this option is set, Alpine will check to see if the message about to be sent + has a Fcc or not. + If not, you will be asked if you want to send the message anyway. +

    + +

    + <End of help on this topic> + + ====== h_config_warn_if_no_to_or_cc ===== *************** *** 33674,33679 **** --- 33696,33704 ---- ========== h_send_check_subj ========== Yes, send message without a Subject. No, return to composer. + ========== h_send_check_fcc ========== + Yes, send message without a Fcc. + No, return to composer. ========== h_send_check_to_cc ========== Yes, send message without a To address, or a Cc address, or a Newsgroup. No, return to composer. Only in alpine-1.00.orig/po: Makefile.in Only in alpine-1.00.new/po: stamp-po Only in alpine-1.00.new/regex: .deps Only in alpine-1.00.new/regex: Makefile Only in alpine-1.00.new/web/src/alpined.d: .deps Only in alpine-1.00.new/web/src/alpined.d: Makefile Only in alpine-1.00.new/web/src: Makefile Only in alpine-1.00.new/web/src/pubcookie: .deps Only in alpine-1.00.new/web/src/pubcookie: Makefile