X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compose.c;h=340138806308ad5f57f83c7236174fa501109237;hb=b4e1f0143e321a296e7b90c5b01051b94a8b20cc;hp=5b3687acce0766270595f9488614dcfaf698533f;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;p=apps%2Fmadmutt.git

diff --git a/compose.c b/compose.c
index 5b3687a..3401388 100644
--- a/compose.c
+++ b/compose.c
@@ -328,7 +328,7 @@ static int edit_address_list (int line, address_t ** 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);
   }
@@ -673,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)
@@ -1002,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);
@@ -1150,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)
@@ -1212,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;