Changeset 3309:a01916b5b624

Timestamp:

2003-03-03 00:26:20 (6 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Introduce a new option named $bounce, and fix some inconsistencies
in the messages created when bouncing. Based on work done by Thomas
Glanzmann <sithglan@…>.

Files:

• commands.c (modified) (1 diff)
• contrib/sample.muttrc (modified) (1 diff)
• doc/manual.sgml.head (modified) (1 diff)
• init.h (modified) (1 diff)
• mutt.h (modified) (1 diff)
• recvcmd.c (modified) (3 diffs)

commands.c

@@ -258 +258 @@
 
 #define extra_space (15 + 7 + 2)
-  /*
-   * This is the printing width of "...? ([y=yes]/n=no): ?" plus 2
-   * for good measure. This is not ideal. FIXME.
-   * 
-   * While you fix this, please go to recvcmd.c, and do the same thing there.
-   */
-  snprintf (prompt, sizeof (prompt) - 4,
+  snprintf (prompt, sizeof (prompt),
            (h ? _("Bounce message to %s") : _("Bounce messages to %s")), buf);
-  mutt_format_string (prompt, sizeof (prompt) - 4,
-                      0, COLS-extra_space, 0, 0,
-                      prompt, sizeof (prompt), 0);
-  strcat (prompt, "...?");      /* __STRCAT_CHECKED__ */
-  if (mutt_yesorno (prompt, M_YES) != M_YES)
+
+  if (mutt_strwidth (prompt) > COLS - extra_space)
+  {
+    mutt_format_string (prompt, sizeof (prompt),
+                        0, COLS-extra_space, 0, 0,
+                        prompt, sizeof (prompt), 0);
+    strncat (prompt, "...?", sizeof (prompt));
+  }
+  else
+    strncat (prompt, "?", sizeof (prompt));
+
+  if (query_quadoption (OPT_BOUNCE, prompt) == M_NO)
   {
     rfc822_free_address (&adr);
-    CLEARLINE (LINES-1);
+    CLEARLINE (LINES - 1);
+    mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
+  CLEARLINE (LINES - 1);
+  
   rc = mutt_bounce_message (NULL, h, adr);
   rfc822_free_address (&adr);

contrib/sample.muttrc

@@ -34 +34 @@
 set edit_headers                # let me edit the message header when composing
 #set editor="emacs -nw"         # editor to use when composing messages
+#set fast_bounce                # don't ask about bouncing messages, just do it
 #set fast_reply                 # skip initial prompts when replying
 #set fcc_attach                 # keep attachments in copies of sent messages?

doc/manual.sgml.head

@@ -492 +492 @@
 you are replying to or forwarding a message.  See also <ref id="askcc"
 name="&dollar;askcc">, <ref id="askbcc" name="&dollar;askbcc">, <ref
-id="autoedit" name="&dollar;autoedit">, and <ref id="fast_reply"
+id="autoedit" name="&dollar;autoedit">, <ref id="bounce"
+name="&dollar;bounce">, and <ref id="fast_reply"
 name="&dollar;fast&lowbar;reply"> for changing how Mutt asks these
 questions.

init.h

@@ -268 +268 @@
   ** notifying you of new mail.  This is independent of the setting of the
   ** ``$$beep'' variable.
+  */
+  { "bounce",   DT_QUAD, R_NONE, OPT_BOUNCE, M_ASKYES },
+  /*
+  ** Controls whether you will be asked to confirm bouncing messages.
+  ** If set to \fIyes\fP you don't get asked if you want to bounce a
+  ** message. Setting this variable to \fIno\fP is not generally useful,
+  ** and thus not recommended, because your are unable to bounce message.
   */
   { "bounce_delivered", DT_BOOL, R_NONE, OPTBOUNCEDELIVERED, 1 },

mutt.h

@@ -289 +289 @@
   OPT_MIMEFWDREST,
   OPT_FORWEDIT,
-  OPT_MAX
+  OPT_MAX,
+  OPT_BOUNCE
 };
 

recvcmd.c

@@ -127 +127 @@
 {
   short i;
-  short ntagged;
   char prompt[STRING];
   char buf[HUGE_STRING];
   ADDRESS *adr = NULL;
+  int ret = 0;
+  int p   = 0;
 
   if (check_all_msg (idx, idxlen, cur, 1) == -1)
     return;
 
-  ntagged = count_tagged (idx, idxlen);
-  
-  if (cur || ntagged == 1)
+  /* one or more messages? */
+  p = (cur || count_tagged (idx, idxlen) == 1);
+
+  if (p)
     strfcpy (prompt, _("Bounce message to: "), sizeof (prompt));
   else
@@ -162 +164 @@
    */
   snprintf (prompt, sizeof (prompt) - 4, 
-            cur ? _("Bounce message to %s...?") :  _("Bounce messages to %s...?"), buf);
-
-  mutt_format_string (prompt, sizeof (prompt) - 4,
-                      0, COLS-extra_space, 0, 0,
-                      prompt, sizeof (prompt), 0);
-  strcat (prompt, "...?");      /* __STRCAT_CHECKED__ */
-
-  if (mutt_yesorno (prompt, M_YES) != M_YES)
-    goto bail;
-
+   (p ? _("Bounce message to %s") : _("Bounce messages to %s")), buf);
+  
+  if (mutt_strwidth (prompt) > COLS - extra_space)
+  {
+    mutt_format_string (prompt, sizeof (prompt) - 4,
+                        0, COLS-extra_space, 0, 0,
+                        prompt, sizeof (prompt), 0);
+    strncat (prompt, "...?", sizeof (prompt));
+  }
+  else
+    strncat (prompt, "?", sizeof (prompt));
+
+  if (query_quadoption (OPT_BOUNCE, prompt) == M_NO)
+  {
+    rfc822_free_address (&adr);
+    CLEARLINE (LINES - 1);
+    mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
+    return;
+  }
+  
+  CLEARLINE (LINES - 1);
+  
   if (cur)
-    mutt_bounce_message (fp, cur->hdr, adr);
+    ret = mutt_bounce_message (fp, cur->hdr, adr);
   else
   {
@@ -179 +193 @@
     {
       if (idx[i]->content->tagged)
-        mutt_bounce_message (fp, idx[i]->content->hdr, adr);
-    }
-  }
-
-bail:
-
-  rfc822_free_address (&adr);
-  CLEARLINE (LINES - 1);
+        if (mutt_bounce_message (fp, idx[i]->content->hdr, adr))
+          ret = 1;
+    }
+  }
+
+  if (!ret)
+    mutt_message (p ? _("Message bounced.") : _("Messages bounced."));
+  else
+    mutt_error (p ? _("Error bouncing message!") : _("Error bouncing messages!"));
 }