X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=e4db1d8fe4f664011af29b90304a40277186eefe;hp=45dec598d16996a4052f5f2fda5c4cd375f2af4f;hb=486de69aa30a7bfca3625a1b521411dc7a15c55c;hpb=8d429041536e4508e8dd00b390721895dc324b9b

diff --git a/recvcmd.c b/recvcmd.c
index 45dec59..e4db1d8 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -32,7 +32,7 @@
 
 static short check_msg (BODY * b, short err)
 {
-  if (!mutt_is_message_type (b->type, b->subtype)) {
+  if (!mutt_is_message_type(b)) {
     if (err)
       mutt_error _("You may only bounce message/rfc822 parts.");
 
@@ -153,7 +153,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
   }
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), adr, 1);
+  rfc822_addrcat(buf, sizeof(buf), adr, 1);
 
 #define extra_space (15+7+2)
   /*
@@ -163,7 +163,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
             (p ? _("Bounce message to %s") : _("Bounce messages to %s")),
             buf);
 
-  if (mutt_strwidth (prompt) > COLS - extra_space) {
+  if (m_strwidth(prompt) > COLS - extra_space) {
     mutt_format_string (prompt, sizeof (prompt) - 4,
                         0, COLS - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
@@ -239,8 +239,7 @@ static HEADER *find_common_parent (ATTACHPTR ** idx, short idxlen,
       break;
 
   while (--i >= 0) {
-    if (mutt_is_message_type
-        (idx[i]->content->type, idx[i]->content->subtype)) {
+    if (mutt_is_message_type(idx[i]->content)) {
       nchildren = count_tagged_children (idx, idxlen, i);
       if (nchildren == nattach)
         return idx[i]->content->hdr;
@@ -278,8 +277,7 @@ static HEADER *find_parent (ATTACHPTR ** idx, short idxlen, BODY * cur,
 
   if (cur) {
     for (i = 0; i < idxlen; i++) {
-      if (mutt_is_message_type
-          (idx[i]->content->type, idx[i]->content->subtype)
+      if (mutt_is_message_type(idx[i]->content)
           && is_parent (i, idx, idxlen, cur))
         parent = idx[i]->content->hdr;
       if (idx[i]->content == cur)
@@ -296,7 +294,7 @@ static void include_header (int quote, FILE * ifp,
                             HEADER * hdr, FILE * ofp, char *_prefix)
 {
   int chflags = CH_DECODE;
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
 
   if (option (OPTWEED))
     chflags |= CH_WEED | CH_REORDER;
@@ -813,7 +811,7 @@ void mutt_attach_reply (FILE * fp, HEADER * hdr,
   char tmpbody[_POSIX_PATH_MAX];
   FILE *tmpfp;
 
-  char prefix[SHORT_STRING];
+  char prefix[STRING];
   int rc;
 
 #ifdef USE_NNTP