X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=340138806308ad5f57f83c7236174fa501109237;hp=b0b20aaad361f837de05f14bb7661febdb571613;hb=2b2f17c2b838911949a6e8665ef3131382099a62;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13 diff --git a/compose.c b/compose.c index b0b20aa..3401388 100644 --- a/compose.c +++ b/compose.c @@ -19,6 +19,9 @@ #include #include #include +#include + +#include #include "mutt.h" #include "enter.h" @@ -26,10 +29,8 @@ #include "mutt_idna.h" #include "mutt_menu.h" #include "rfc1524.h" -#include "mime.h" #include "attach.h" #include "recvattach.h" -#include "mapping.h" #include "sort.h" #include "charset.h" #include "mx.h" @@ -265,7 +266,7 @@ static int check_attachments (ATTACHPTR ** idx, short idxlen) return 0; } -static void draw_envelope_addr (int line, ADDRESS * addr) +static void draw_envelope_addr (int line, address_t * addr) { char buf[STRING]; @@ -319,7 +320,7 @@ static void draw_envelope (HEADER * msg, char *fcc) SETCOLOR (MT_COLOR_NORMAL); } -static int edit_address_list (int line, ADDRESS ** addr) +static int edit_address_list (int line, address_t ** addr) { char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */ char *err = NULL; @@ -327,7 +328,7 @@ static int edit_address_list (int line, ADDRESS ** addr) mutt_addrlist_to_local (*addr); rfc822_write_address (buf, sizeof (buf), *addr, 0); if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) { - rfc822_free_address (addr); + address_delete (addr); *addr = mutt_parse_adrlist (*addr, buf); *addr = mutt_expand_aliases (*addr); } @@ -672,7 +673,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ else buf[0] = 0; if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) { - str_replace (&msg->env->subject, buf); + m_strreplace(&msg->env->subject, buf); move (HDR_SUBJECT, HDR_XOFFSET + SW); clrtoeol (); if (msg->env->subject) @@ -1001,7 +1002,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ NONULL(idx[menu->current]->content->description)); /* header names should not be translated */ if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) { - str_replace (&idx[menu->current]->content->description, buf); + m_strreplace(&idx[menu->current]->content->description, buf); menu->redraw = REDRAW_CURRENT; } mutt_message_hook (NULL, msg, M_SEND2HOOK); @@ -1149,7 +1150,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ if (mutt_rename_file (idx[menu->current]->content->filename, fname)) break; - str_replace (&idx[menu->current]->content->filename, fname); + m_strreplace(&idx[menu->current]->content->filename, fname); menu->redraw = REDRAW_CURRENT; if (idx[menu->current]->content->stamp >= st.st_mtime) @@ -1211,7 +1212,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ update_idx (menu, idx, idxlen++); idx[menu->current]->content->type = itype; - str_replace (&idx[menu->current]->content->subtype, p); + m_strreplace(&idx[menu->current]->content->subtype, p); idx[menu->current]->content->unlink = 1; menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;