not having wide chars is soooo 90, please, I *really* don't care with

[apps/madmutt.git] / sidebar.c

diff --git a/sidebar.c b/sidebar.c
index 5ce1922..faf9bcf 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -16,9 +16,10 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "keymap.h"
@@ -190,9 +191,7 @@ int make_sidebar_entry (char* box, int idx, size_t len)
 {
   int shortened = 0, lencnt = 0;
   char no[SHORT_STRING], entry[SHORT_STRING];
-#if USE_IMAP
   int l = m_strlen(ImapHomeNamespace);
-#endif
   int l_m = m_strlen(Maildir);
 
   if (SidebarWidth > COLS)
@@ -210,12 +209,10 @@ int make_sidebar_entry (char* box, int idx, size_t len)
   lencnt = m_strlen(no);
   memset(&entry, ' ', sizeof(entry));
 
-#if USE_IMAP
   if (l > 0 && m_strncmp(box, ImapHomeNamespace, l) == 0 && 
       m_strlen(box) > l)
     box += l + 1; /* we're trimming the ImapHomeNamespace, the "+ 1" is for the separator */
   else
-#endif
   if (l_m > 0 && m_strncmp(box, Maildir, l_m) == 0 && 
       m_strlen(box) > l_m) {
     box += l_m;