X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mx.c;h=5a815fed235d52bc936a25d20613e1d8a2d14bdb;hp=94004833282f40ef66a9c1a18cd7a297a1e7acc1;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/mx.c b/mx.c
index 9400483..5a815fe 100644
--- a/mx.c
+++ b/mx.c
@@ -13,10 +13,12 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "buffy.h"
-#include "ascii.h"
 #include "mx.h"
 #include "mbox.h"
 #include "mh.h"
@@ -53,8 +55,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/list.h"
 #include "lib/debug.h"
 
@@ -343,7 +343,7 @@ void mx_unlink_empty (const char *path)
 int mx_get_magic (const char *path) {
   int i = 0;
 
-  if (str_len (path) == 0)
+  if (m_strlen(path) == 0)
     return (-1);
   if ((i = mx_get_idx (path)) >= 0)
     return (MX_COMMAND(i,type));
@@ -521,7 +521,7 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
   if (!ctx)
     ctx = p_new(CONTEXT, 1);
   p_clear(ctx, 1);
-  ctx->path = str_dup (path);
+  ctx->path = m_strdup(path);
 
   ctx->msgnotreadyet = -1;
   ctx->collapsed = 0;