reorganize code a lot: create a lib-crypt with everything smime or gpg

[apps/madmutt.git] / curs_lib.c

diff --git a/curs_lib.c b/curs_lib.c
index 002c063..451a6b1 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -18,6 +18,7 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -298,7 +299,6 @@ void mutt_curses_error (const char *fmt, ...)
   set_option (OPTMSGERR);
 }
 
-#ifdef USE_SOCKET
 void mutt_progress_bar (progress_t* progress, long pos) {
   char posstr[SHORT_STRING];
 
@@ -326,7 +326,6 @@ void mutt_progress_bar (progress_t* progress, long pos) {
       mutt_message ("%s %s", progress->msg, posstr);
   }
 }
-#endif
 
 void mutt_curses_message (const char *fmt, ...)
 {
@@ -583,7 +582,7 @@ int mutt_addwch (wchar_t wc)
  */
 
 void mutt_format_string (char *dest, size_t destlen,
-                         int min_width, int max_width,
+                         unsigned int min_width, int max_width,
                          int right_justify, char m_pad_char,
                          const char *s, size_t n, int arboreal)
 {
@@ -620,7 +619,7 @@ void mutt_format_string (char *dest, size_t destlen,
       destlen -= k2;
     }
   }
-  w = (int) destlen < min_width ? destlen : min_width;
+  w = destlen < min_width ? destlen : min_width;
   if (w <= 0)
     *p = '\0';
   else if (right_justify) {