begin to move ui code into the lib-ui

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

diff --git a/Makefile.am b/Makefile.am
index 0c900a5..7b69a8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ NNTP_INCLUDES = -I$(top_srcdir)/nntp
 endif
 
 SUBDIRS = intl m4 po $(XXXXXXXXXXXX_doc) contrib \
-         lib-lib lib-mime lib-crypt lib-hash lib \
+         lib-lib lib-mime lib-crypt lib-hash lib-ui lib \
          pop imap $(NNTP_SUBDIR)
 
 BUILT_SOURCES = keymap_defs.h version.h
@@ -18,9 +18,8 @@ BUILT_SOURCES = keymap_defs.h version.h
 bin_PROGRAMS = madmutt madmutt_dotlock pgpringng pgpewrapng smime_keysng
 madmutt_SOURCES = $(BUILT_SOURCES) \
        alias.c attach.c base64.c browser.c buffy.c \
-       charset.c color.c compress.c commands.c complete.c \
-       compose.c copy.c curs_lib.c curs_main.c \
-       editmsg.c enter.c \
+       charset.c compress.c commands.c complete.c \
+       compose.c copy.c editmsg.c enter.c \
        flags.c filter.c from.c getdomain.c \
        handler.c hcache.c hdrline.c headers.c help.c history.c hook.c \
        init.c keymap.c lib.c \
@@ -34,6 +33,7 @@ madmutt_SOURCES = $(BUILT_SOURCES) \
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \
               -Llib-lib -llib -Llib-mime -lmime -Llib-crypt -lcrypt -Llib-hash -lhash \
+              -Llib-ui -lui \
               -Llib -lsane $(MUTTLIBS) $(INTLLIBS) $(LIBICONV)
 
 madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
@@ -41,6 +41,7 @@ madmutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
                       $(top_builddir)/lib-mime/libmime.a \
                       $(top_builddir)/lib-crypt/libcrypt.a \
                       $(top_builddir)/lib-hash/libhash.a \
+                      $(top_builddir)/lib-ui/libui.a \
                       $(top_builddir)/lib/libsane.a \
                       \
                       $(top_builddir)/pop/libpop.a  \
@@ -75,7 +76,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        dotlock.h functions.def gen_defs \
        enter.h recvattach.h handler.h thread.h \
        globals.h history.h init.h keymap.h mutt_crypt.h \
-       mime.h mutt.h mutt_curses.h mutt_menu.h \
+       mime.h mutt.h mutt_menu.h \
        mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
        mbox.h mh.h mx.h pager.h protos.h rfc1524.h \
        rfc3676.h sort.h mime.types autogen.sh \

diff --git a/alias.c b/alias.c
index f9d7b77..49b0cf7 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -21,12 +21,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "lib/rx.h"
 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "sort.h"

diff --git a/attach.c b/attach.c
index d2ed956..720e17a 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -20,11 +20,12 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "rfc1524.h"
 #include "pager.h"

diff --git a/browser.c b/browser.c
index 443283d..3999872 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -17,10 +17,11 @@
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mx.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "buffy.h"
 #include "sort.h"

diff --git a/buffy.c b/buffy.c
index 9f8b9f6..4a30783 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -18,6 +18,8 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include <imap/imap.h>
 
 #include "mutt.h"
@@ -26,7 +28,6 @@
 #include "mh.h"
 #include "sidebar.h"
 
-#include "mutt_curses.h"
 
 #include <string.h>
 #include <sys/stat.h>

diff --git a/commands.c b/commands.c
index aca2845..d3ee541 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -19,10 +19,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "copy.h"

diff --git a/compose.c b/compose.c
index 44c7f4d..538d5ad 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -23,9 +23,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"

diff --git a/compress.c b/compress.c
index 87d8e4f..dcf6143 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -12,11 +12,12 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 
 #include "mx.h"
 #include "mbox.h"
-#include "mutt_curses.h"
 
 #include "lib/debug.h"
 

diff --git a/configure.ac b/configure.ac
index 2327b8f..47624b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -929,6 +929,7 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         lib-mime/Makefile
         lib-crypt/Makefile
         lib-hash/Makefile
+        lib-ui/Makefile
         lib/Makefile
         imap/Makefile
         pop/Makefile

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 145a6e0..8645f67 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -26,10 +26,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "handler.h"
 #include "enter.h"
 #include "copy.h"

diff --git a/enter.c b/enter.c
index b310ea1..e4f1b10 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -14,10 +14,11 @@
 
 #include <lib-lib/mem.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "history.h"
 #include "buffy.h"

diff --git a/flags.c b/flags.c
index 814b19a..dc6bafa 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -13,8 +13,9 @@
 
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "mx.h"

diff --git a/handler.c b/handler.c
index a693fe6..a2b3e9d 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -26,10 +26,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "recvattach.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "rfc1524.h"
 #include "rfc3676.h"
 #include "keymap.h"

diff --git a/hdrline.c b/hdrline.c
index 72a1674..f50cc84 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -11,8 +11,9 @@
 # include "config.h"
 #endif
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "thread.h"
 #include "charset.h"

diff --git a/help.c b/help.c
index a7b8c9f..c0b2252 100644 (file)
--- a/help.c
+++ b/help.c
@@ -18,8 +18,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "pager.h"
 

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 0c91e7e..290f81a 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -13,9 +13,10 @@
 
 #include <inttypes.h>
 
+#include <lib-ui/curses.h>
+
 #include "imap.h"
 #include "mutt_socket.h"
-#include "mutt_curses.h"
 
 /* -- symbols -- */
 #define IMAP_PORT 143

diff --git a/imap/message.c b/imap/message.c
index 518718f..525f008 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -22,8 +22,9 @@
 #include <lib-lib/str.h>
 #include <lib-lib/buffer.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "imap_private.h"
 #include "message.h"
 #include "mx.h"

diff --git a/init.c b/init.c
index 69de16b..6545888 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,8 +22,9 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "history.h"
 #include "keymap.h"
 #include "mbyte.h"

diff --git a/keymap.c b/keymap.c
index e8bd397..c7cede6 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -18,9 +18,10 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include <lib-crypt/crypt.h>
 

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index 66b8531..e4457a8 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -24,9 +24,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "copy.h"
 #include "crypt.h"
 #include "pgp.h"

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 26f79d9..7982dca 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -29,10 +29,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "pgp.h"
 #include "copy.h"
 #include "attach.h"

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index e22086e..0314412 100644 (file)
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -32,8 +32,9 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "pgp.h"
 

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index b31676a..1a49ec2 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -20,10 +20,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "pgp.h"
 #include "pager.h"

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 3040268..81bcfb8 100644 (file)
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -20,10 +20,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "handler.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "copy.h"
 

diff --git a/lib-ui/Makefile.am b/lib-ui/Makefile.am
new file mode 100644 (file)
index 0000000..d28b350
--- /dev/null
+++ b/lib-ui/Makefile.am
@@ -0,0 +1,8 @@
+noinst_LIBRARIES = libui.a
+
+libui_a_SOURCES = curses.h     \
+                 color.c curs_lib.c curs_main.c
+
+noinst_HEADERS  = curses.h
+
+-include ../cflags.mk

diff --git a/color.c b/lib-ui/color.c
similarity index 99%
rename from color.c
rename to lib-ui/color.c
index 4166468..c573520 100644 (file)
--- a/color.c
+++ b/lib-ui/color.c
@@ -18,8 +18,9 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 
 #include "lib/debug.h"
 

diff --git a/curs_lib.c b/lib-ui/curs_lib.c
similarity index 99%
rename from curs_lib.c
rename to lib-ui/curs_lib.c
index 165c4fd..aaaf3ce 100644 (file)
--- a/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -20,10 +20,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "pager.h"
 #include "mbyte.h"
 
@@ -589,7 +590,7 @@ void mutt_format_string (char *dest, ssize_t destlen,
   char *p;
   wchar_t wc;
   int w;
-  size_t k, k2;
+  ssize_t k, k2;
   char scratch[MB_LEN_MAX];
   mbstate_t mbstate1, mbstate2;
 
@@ -598,8 +599,8 @@ void mutt_format_string (char *dest, ssize_t destlen,
   --destlen;
   p = dest;
   for (; n && (k = mbrtowc (&wc, s, n, &mbstate1)); s += k, n -= k) {
-    if (k == (size_t) (-1) || k == (size_t) (-2)) {
-      k = (k == (size_t) (-1)) ? 1 : n;
+    if (k == -1 || k == -2) {
+      k = (k == -1) ? 1 : n;
       wc = replacement_char ();
     }
     if (arboreal && wc < M_TREE_MAX)

diff --git a/curs_main.c b/lib-ui/curs_main.c
similarity index 99%
rename from curs_main.c
rename to lib-ui/curs_main.c
index 4917163..94b1d6f 100644 (file)
--- a/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -19,10 +19,11 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include <pop/pop.h>
 
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "mx.h"
 #include "mutt_menu.h"
 #include "sort.h"
@@ -38,7 +39,7 @@
 #include <lib-crypt/crypt.h>
 
 #ifdef USE_NNTP
-#include "nntp.h"
+#include "nntp/nntp.h"
 #endif
 
 #ifdef USE_SASL
@@ -794,7 +795,7 @@ int mutt_index_menu (void)
       CHECK_MSGCOUNT;
       if (Context->magic == M_NNTP) {
         HEADER *h;
-        int old = CURHDR->index, i;
+        int old = CURHDR->index;
 
         if (!CURHDR->env->message_id) {
           mutt_error (_("No Message-ID. Unable to perform operation"));

diff --git a/mutt_curses.h b/lib-ui/curses.h
similarity index 85%
rename from mutt_curses.h
rename to lib-ui/curses.h
index 3bd9f96..6a33540 100644 (file)
--- a/mutt_curses.h
+++ b/lib-ui/curses.h
@@ -10,6 +10,8 @@
 #ifndef _MUTT_CURSES_H
 #define _MUTT_CURSES_H
 
+#include "mutt.h"
+
 #ifdef USE_SLANG_CURSES
 
 #ifndef unix                    /* this symbol is not defined by the hp-ux compiler (sigh) */
@@ -159,28 +161,4 @@ void ci_start_color (void);
 
 #define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
 
-/* ----------------------------------------------------------------------------
- * These are here to avoid compiler warnings with -Wall under SunOS 4.1.x
- */
-
-#if !defined(STDC_HEADERS) && !defined(NCURSES_VERSION) && !defined(USE_SLANG_CURSES)
-extern int endwin ();
-extern int printw ();
-extern int beep ();
-extern int isendwin ();
-extern int w32addch ();
-extern int keypad ();
-extern int wclrtobot ();
-extern int mvprintw ();
-extern int getcurx ();
-extern int getcury ();
-extern int noecho ();
-extern int wdelch ();
-extern int wrefresh ();
-extern int wmove ();
-extern int wclear ();
-extern int waddstr ();
-extern int wclrtoeol ();
-#endif
-
 #endif /* !_MUTT_CURSES_H */

diff --git a/main.c b/main.c
index ada2c8d..84c320e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,12 +24,13 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mx.h"
 #include "buffy.h"
 #include "sort.h"
 #include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "url.h"
 #include "mutt_idna.h"

diff --git a/menu.c b/menu.c
index 90e2bdc..5b37afe 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -15,9 +15,10 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mbyte.h"
 #include "sidebar.h"

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 2354cd9..aadbf7a 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -24,10 +24,11 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mutt_socket.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "mutt_ssl.h"
 
 #include "lib/debug.h"

diff --git a/mutt_ssl_gnutls.c b/mutt_ssl_gnutls.c
index 61a2da8..147ddca 100644 (file)
--- a/mutt_ssl_gnutls.c
+++ b/mutt_ssl_gnutls.c
@@ -25,9 +25,10 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mutt_socket.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_ssl.h"
 

diff --git a/muttlib.c b/muttlib.c
index 0f6114e..d8f2d44 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -21,9 +21,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "mx.h"
 #include "url.h"
 #include "attach.h"

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index fe774ad..40160c1 100644 (file)
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -20,8 +20,9 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "nntp.h"

diff --git a/nntp/nntp.c b/nntp/nntp.c
index c9b1a02..00ba407 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -20,8 +20,9 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "mx_nntp.h"

diff --git a/pager.c b/pager.c
index e18bd14..c575e64 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -20,9 +20,10 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "sort.h"

diff --git a/pop/pop.c b/pop/pop.c
index 2e87631..999d3b1 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -16,11 +16,12 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mx.h"
 #include "pop.h"
 #include <lib-crypt/crypt.h>
-#include "mutt_curses.h"
 
 #include "lib/debug.h"
 

diff --git a/pop/pop.h b/pop/pop.h
index fe49b4b..edde8b7 100644 (file)
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -10,9 +10,10 @@
 #ifndef _POP_H
 #define _POP_H 1
 
+#include <lib-ui/curses.h>
+
 #include "mx.h"
 #include "mutt_socket.h"
-#include "mutt_curses.h"
 
 #define POP_PORT 110
 #define POP_SSL_PORT 995

diff --git a/recvattach.c b/recvattach.c
index 56ad9bb..d16a429 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -21,11 +21,12 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "attach.h"

diff --git a/recvcmd.c b/recvcmd.c
index 6d0a4ea..7e5adbd 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -19,12 +19,13 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "attach.h"

diff --git a/remailer.c b/remailer.c
index 2a0ffa2..94cd444 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -22,9 +22,10 @@
 #include <lib-lib/file.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mutt_menu.h"
 
 #include "remailer.h"

diff --git a/resize.c b/resize.c
index 8c750da..1c7febb 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -11,8 +11,9 @@
 # include "config.h"
 #endif
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/rfc3676.c b/rfc3676.c
index c194540..f1cd2e3 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -26,8 +26,9 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "handler.h"
 #include "state.h"
 #include "lib.h"

diff --git a/send.c b/send.c
index a582451..f1c0749 100644 (file)
--- a/send.c
+++ b/send.c
@@ -19,9 +19,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "enter.h"
-#include "mutt_curses.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"

diff --git a/sendlib.c b/sendlib.c
index 57e4de8..8aad968 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -21,10 +21,11 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_curses.h"
 #include "mx.h"
 #include "copy.h"
 #include "pager.h"

diff --git a/sidebar.c b/sidebar.c
index deecda6..0d63aaa 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -16,9 +16,10 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sidebar.h"
 #include "buffy.h"
 #include "keymap.h"

diff --git a/signal.c b/signal.c
index 126ebbb..6600a82 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -13,8 +13,9 @@
 
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 
 #include <signal.h>
 #include <string.h>

diff --git a/status.c b/status.c
index 51f22d6..18c9684 100644 (file)
--- 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 "mutt.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "buffy.h"