X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=sidebar.c;h=15a2eef6d9e1aff8e85a94c1ea18be0eb9a6078b;hb=c01e17f6b99066ca30931a082ea855656174619b;hp=5ce19220145b788ee29b7aff2c64dd5023e59475;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;p=apps%2Fmadmutt.git

diff --git a/sidebar.c b/sidebar.c
index 5ce1922..15a2eef 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -12,21 +12,22 @@
  * please see the file GPL in the top level source directory.
  */
 
+#include <libgen.h>
+#include <ctype.h>
+
 #include <lib-lib/mem.h>
 #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 "charset.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "keymap.h"
 
-
-#include <libgen.h>
-#include <ctype.h>
-
 static int TopBuffy = 0;
 static int CurBuffy = 0;
 static int known_lines = 0;
@@ -95,7 +96,7 @@ static char *shortened_hierarchy (char *box, int maxlen)
   return m_strdup(box);
 }
 
-static const char* sidebar_number_format (char* dest, size_t destlen, char op,
+static const char* sidebar_number_format (char* dest, ssize_t destlen, char op,
                                           const char* src, const char* fmt,
                                           const char* ifstr, const char* elstr,
                                           unsigned long data, format_flag flags) {
@@ -186,13 +187,11 @@ int sidebar_need_count (void) {
  *      0       item was not printed ('cause of $sidebar_newmail_only)
  *      1       item was printed
  */
-int make_sidebar_entry (char* box, int idx, size_t len)
+int make_sidebar_entry (char* box, int idx, ssize_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;
@@ -276,7 +273,7 @@ void sidebar_set_buffystats (CONTEXT* Context) {
 }
 
 void sidebar_draw_frames (void) {
-  size_t i,delim_len;
+  ssize_t i,delim_len;
 
   if (!option(OPTMBOXPANE) || SidebarWidth==0) 
     return;
@@ -328,7 +325,7 @@ int sidebar_draw (int menu) {
       last_line = LINES - 2 + (option (OPTSTATUSONTOP) && !option (OPTHELP) ? 1 : 0),
       i = 0,line;
   BUFFY *tmp;
-  size_t delim_len = m_strlen(SidebarDelim);
+  ssize_t delim_len = m_strlen(SidebarDelim);
   char blank[SHORT_STRING];
 
   known_lines=last_line-first_line;