X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=630c6c94e91f08568ffc47541a2b3d24aa819ba2;hp=3de34a9bf678116353d755984c5878a859f0b817;hb=f2ff91d8b7627e22af9715d384b6f9e9e802a39e;hpb=3c94b38b2555a98b4a7f3d9d9e1ac4aadc830edf

diff --git a/compose.c b/compose.c
index 3de34a9..630c6c9 100644
--- a/compose.c
+++ b/compose.c
@@ -14,8 +14,8 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-sys/unix.h>
-
 #include <lib-mime/mime.h>
+#include <lib-crypt/crypt.h>
 
 #include <lib-ui/curses.h>
 #include <lib-ui/enter.h>
@@ -119,8 +119,6 @@ static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
                      M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
 }
 
-#include <lib-crypt/crypt.h>
-
 static void redraw_crypt_lines (HEADER * msg)
 {
   int off = 0;
@@ -233,7 +231,7 @@ static void draw_envelope_addr (int line, address_t * addr)
   char buf[STRING];
 
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), addr, 1);
   mvprintw (line, SW, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
 }
@@ -283,7 +281,7 @@ static int edit_address_list (int line, address_t ** addr)
   char *err = NULL;
 
   mutt_addrlist_to_local (*addr);
-  rfc822_write_address (buf, sizeof (buf), *addr, 0);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 0);
   if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
     address_list_wipe(addr);
     *addr = mutt_parse_adrlist (*addr, buf);
@@ -303,7 +301,7 @@ static int edit_address_list (int line, address_t ** addr)
 
   /* redraw the expanded list so the user can see the result */
   buf[0] = 0;
-  rfc822_write_address (buf, sizeof (buf), *addr, 1);
+  rfc822_addrcat(buf, sizeof (buf), *addr, 1);
   move (line, HDR_XOFFSET + SW);
   mutt_paddstr (W, buf);
 
@@ -364,7 +362,7 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen)
  * applied.
  *
  */
-static unsigned long cum_attachs_size (MUTTMENU * menu)
+static unsigned long cum_attachs_size(MUTTMENU * menu)
 {
   ssize_t s;
   unsigned short i;
@@ -692,9 +690,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
       menu->redraw = REDRAW_FULL;
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
-      break;
-
-
+      break; 
 
     case OP_COMPOSE_ATTACH_KEY:
       if (idxlen == idxmax) {
@@ -719,8 +715,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
 
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
-      break;
-
+      break; 
 
     case OP_COMPOSE_ATTACH_FILE:
       {
@@ -1278,8 +1273,6 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       }
       break;
 
-
-
     case OP_COMPOSE_PGP_MENU:
       if (msg->security & APPLICATION_SMIME) {
         if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "),
@@ -1294,12 +1287,10 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       mutt_message_hook (NULL, msg, M_SEND2HOOK);
       break;
 
-
     case OP_FORGET_PASSPHRASE:
       crypt_forget_passphrase ();
       break;
 
-
     case OP_COMPOSE_SMIME_MENU:
       if (msg->security & APPLICATION_PGP) {
         if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),