X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=complete.c;h=5e66da81290cac0f9fe34348a45405169674e206;hp=bd2bb052be5a5f2a568b17bab598ba30b94ab237;hb=801f3f67bcbe19eb511eb879bbda531aeb1b76fc;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/complete.c b/complete.c
index bd2bb05..5e66da8 100644
--- a/complete.c
+++ b/complete.c
@@ -12,10 +12,8 @@
 #endif
 
 #include "mutt.h"
-#ifdef USE_IMAP
 #include "mx.h"
-#include "imap.h"
-#endif
+#include <imap/imap.h>
 #ifdef USE_NNTP
 #include "nntp.h"
 #endif
@@ -45,9 +43,7 @@ int mutt_complete (char *s, size_t slen)
   char dirpart[_POSIX_PATH_MAX], exp_dirpart[_POSIX_PATH_MAX];
   char filepart[_POSIX_PATH_MAX];
 
-#ifdef USE_IMAP
   char imap_path[LONG_STRING];
-#endif
 
   debug_print (2, ("completing %s\n", s));
 
@@ -101,7 +97,6 @@ int mutt_complete (char *s, size_t slen)
   }
 #endif
 
-#ifdef USE_IMAP
   /* we can use '/' as a delimiter, imap_complete rewrites it */
   if (*s == '=' || *s == '+' || *s == '!') {
       const char *q = NONULL(*s == '!' ? Spoolfile : Maildir);
@@ -112,7 +107,6 @@ int mutt_complete (char *s, size_t slen)
 
   if (mx_get_magic (imap_path) == M_IMAP)
     return imap_complete (s, slen, imap_path);
-#endif
 
   if (*s == '=' || *s == '+' || *s == '!') {
     dirpart[0] = *s;