X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compose.c;h=f5d6d2b730abd16d6f4ae734eb5e89e070aa5518;hb=21595f98b7c8132f99abb9fee60ecdce31fc980f;hp=b46050ecd35b7061747e61dd20fa8d45c852c6d7;hpb=617e7d83d14e14e6a520a48e75437211b16c8834;p=apps%2Fmadmutt.git

diff --git a/compose.c b/compose.c
index b46050e..f5d6d2b 100644
--- a/compose.c
+++ b/compose.c
@@ -16,6 +16,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -41,8 +43,6 @@
 #include "nntp.h"
 #endif
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <errno.h>
 #include <string.h>
@@ -223,14 +223,14 @@ static void redraw_mix_line (LIST * chain)
     if (t && t[0] == '0' && t[1] == '\0')
       t = "<random>";
 
-    if (c + str_len (t) + 2 >= COLS - SW)
+    if (c + m_strlen(t) + 2 >= COLS - SW)
       break;
 
     addstr (NONULL (t));
     if (chain->next)
       addstr (", ");
 
-    c += str_len (t) + 2;
+    c += m_strlen(t) + 2;
   }
 }
 #endif /* MIXMASTER */
@@ -621,7 +621,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->newsgroups);
           str_skip_trailws (buf);
-          msg->env->newsgroups = str_dup (str_skip_initws (buf));
+          msg->env->newsgroups = m_strdup(str_skip_initws (buf));
           move (HDR_TO, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->newsgroups)
@@ -639,7 +639,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             && buf[0]) {
           p_delete(&msg->env->followup_to);
           str_skip_trailws (buf);
-          msg->env->followup_to = str_dup (str_skip_initws (buf));
+          msg->env->followup_to = m_strdup(str_skip_initws (buf));
           move (HDR_CC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->followup_to)
@@ -656,7 +656,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
           p_delete(&msg->env->x_comment_to);
-          msg->env->x_comment_to = str_dup (buf);
+          msg->env->x_comment_to = m_strdup(buf);
           move (HDR_BCC, HDR_XOFFSET);
           clrtoeol ();
           if (msg->env->x_comment_to)