X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=36ed33ac51f0b04b31a5237f0ed92e51a89e166d;hp=18822d469951006c027a22661513d454de9854fa;hb=2b2f17c2b838911949a6e8665ef3131382099a62;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/curs_main.c b/curs_main.c
index 18822d4..36ed33a 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -17,12 +17,12 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
 #include "mx.h"
 #include "mutt_menu.h"
-#include "mapping.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
@@ -113,7 +113,6 @@ static const char *No_visible = N_("No visible messages.");
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-extern const char *ReleaseDate;
 extern size_t UngetCount;
 
 void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
@@ -1234,18 +1233,18 @@ int mutt_index_menu (void)
         mutt_error (_("%s is not a mailbox."), buf);
         break;
       }
-      str_replace (&CurrentFolder, buf);
+      m_strreplace(&CurrentFolder, buf);
 
       if (Context) {
         int check;
 
 #ifdef USE_COMPRESSED
         if (Context->compressinfo && Context->realpath)
-          str_replace (&LastFolder, Context->realpath);
+          m_strreplace(&LastFolder, Context->realpath);
         else
 #endif
 
-          str_replace (&LastFolder, Context->path);
+          m_strreplace(&LastFolder, Context->path);
         oldcount = Context ? Context->msgcount : 0;
 
         if ((check = mx_close_mailbox (Context, &index_hint)) != 0) {