X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=15a2eef6d9e1aff8e85a94c1ea18be0eb9a6078b;hp=deecda69797d9624fef41aa52ee8c9f2ce146bf2;hb=774b53097f8c8b62c5101bce8f313d339387a438;hpb=b8c71f93b0296f815a6538182343ba67e88c0012

diff --git a/sidebar.c b/sidebar.c
index deecda6..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,7 +187,7 @@ 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];
@@ -272,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;
@@ -324,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;