Use ncurses or go away.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index e8fb02e..9236788 100644 (file)
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -61,22 +61,6 @@ event_t mutt_getch (void)
   return (ch == ctrl ('G') ? err : ret);
 }
 
-#ifndef waddnwstr
-int waddwch(WINDOW *win, wchar_t wc)
-{
-    char buf[MB_LEN_MAX * 2];
-    mbstate_t mbstate;
-    ssize_t n1, n2;
-
-    p_clear(&mbstate, 1);
-    if ((n1 = wcrtomb(buf, wc, &mbstate)) == -1
-    ||  (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
-        return -1;                  /* ERR */
-    return waddstr(win, buf);
-}
-#endif
-
-
 int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
                      int complete, int multiple, char ***files, int *numfiles)
 {

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index c059336..9df89be 100644 (file)
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -37,11 +37,7 @@ void mutt_curs_set (int);
 #endif
 
 event_t mutt_getch (void);
-#ifndef waddnwstr
-int waddwch(WINDOW *win, wchar_t w);
-#else
 #define waddwch(win, w)  waddnwstr(win, &(w), 1)
-#endif
 
 void curses_initialize(void);
 void curses_install(void);

diff --git a/lib-ui/lib-ui.h b/lib-ui/lib-ui.h
index 31ad572..8aee933 100644 (file)
--- a/lib-ui/lib-ui.h
+++ b/lib-ui/lib-ui.h
@@ -32,7 +32,7 @@
 #include <curses.h>
 #endif
 
-#include "curses.h"
-#include "layout.h"
+#include <lib-ui/curses.h>
+#include <lib-ui/layout.h>
 
 #endif