X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=1f756a5f0f61f3dae2e821a00c027042da356d6e;hp=51f22d6ce6b0cf5710cc5f3bf8258ab31e3dfb7f;hb=3692b834c97c9933088d7082464fec5ae903920f;hpb=daf6df95bfcc7efc888b488a825e467268f20d3c

diff --git a/status.c b/status.c
index 51f22d6..1f756a5 100644
--- a/status.c
+++ b/status.c
@@ -16,9 +16,10 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "buffy.h"
@@ -30,7 +31,7 @@
 
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
-static char *get_sort_str (char *buf, size_t buflen, int method)
+static char *get_sort_str (char *buf, ssize_t buflen, int method)
 {
   snprintf (buf, buflen, "%s%s%s",
             (method & SORT_REVERSE) ? "reverse-" : "",
@@ -57,7 +58,7 @@ static char *get_sort_str (char *buf, size_t buflen, int method)
  * %t = # of tagged messages [option]
  * %v = Madmutt version 
  * %V = currently active limit pattern [option] */
-static const char *status_format_str (char *buf, size_t buflen, char op,
+static const char *status_format_str (char *buf, ssize_t buflen, char op,
                                       const char *src, const char *prefix,
                                       const char *ifstring,
                                       const char *elsestring,
@@ -299,7 +300,7 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
   return (src);
 }
 
-void menu_status_line (char* buf, size_t len, MUTTMENU* menu, const char* p) {
+void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
   /*
    * if we have enough space for buffer, format lines to $COLS-$SidebarWidth
    * only to not wrap past end of screen