X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=eb19d5abeeca52ea86d43e661c3ff8a6850aa1d2;hp=91abff1c0e350f1c0c6b99283d5d785ab8b13255;hb=801f3f67bcbe19eb511eb879bbda531aeb1b76fc;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/menu.c b/menu.c
index 91abff1..eb19d5a 100644
--- a/menu.c
+++ b/menu.c
@@ -22,10 +22,7 @@
 #include "mbyte.h"
 #include "sidebar.h"
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
+#include <imap/imap.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -687,7 +684,7 @@ static int menu_search (MUTTMENU * menu, int op)
                         _("Reverse search for: "),
                         buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
       return (-1);
-    str_replace (&menu->searchBuf, buf);
+    m_strreplace(&menu->searchBuf, buf);
     menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
   }
   else {
@@ -808,10 +805,7 @@ int mutt_menuLoop (MUTTMENU * menu)
 
 
     mutt_curs_set (0);
-
-#ifdef USE_IMAP
     imap_keepalive ();
-#endif
 
     if (menu_redraw (menu) == OP_REDRAW)
       return OP_REDRAW;