move more files.

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

diff --git a/Makefile.am b/Makefile.am
index 7b69a8f..dabf1f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ 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 compress.c commands.c complete.c \
 madmutt_SOURCES = $(BUILT_SOURCES) \
        alias.c attach.c base64.c browser.c buffy.c \
        charset.c compress.c commands.c complete.c \

-       compose.c copy.c editmsg.c enter.c \
+       compose.c copy.c editmsg.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 \
        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 \


@@ -65,8 +65,7 @@ CPPFLAGS=@CPPFLAGS@ -I$(includedir)
 EXTRA_madmutt_SOURCES = \
        account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
        mutt_tunnel.c resize.c dotlock.c remailer.c \
 EXTRA_madmutt_SOURCES = \
        account.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
        mutt_tunnel.c resize.c dotlock.c remailer.c \

-       alias.h browser.h enter.h \
-       mbyte.h remailer.h url.h state.h \
+       alias.h browser.h mbyte.h remailer.h url.h state.h \

        mutt_idna.h mutt_libesmtp.c sidebar.h state.h
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        mutt_idna.h mutt_libesmtp.c sidebar.h state.h
 
 EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \


@@ -74,7 +73,7 @@ EXTRA_DIST = config.rpath  COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
        account.h alias.h attach.h recvattach.h handler.h thread.h \
        buffy.h charset.h compress.h copy.h \
        dotlock.h functions.def gen_defs \
        account.h alias.h attach.h recvattach.h handler.h thread.h \
        buffy.h charset.h compress.h copy.h \
        dotlock.h functions.def gen_defs \

-       enter.h recvattach.h handler.h thread.h \
+       recvattach.h handler.h thread.h \

        globals.h history.h init.h keymap.h mutt_crypt.h \
        mime.h mutt.h mutt_menu.h \
        mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \
        globals.h history.h init.h keymap.h mutt_crypt.h \
        mime.h mutt.h mutt_menu.h \
        mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \

diff --git a/account.c b/account.c
index 800fdd4..c4eb502 100644 (file)
--- a/account.c
+++ b/account.c
@@ -18,8 +18,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 

+#include <lib-ui/enter.h>
+

 #include "mutt.h"
 #include "mutt.h"

-#include "enter.h"

 #include "account.h"
 #include "url.h"
 
 #include "account.h"
 #include "url.h"
 

diff --git a/alias.c b/alias.c
index 49b0cf7..f0f129d 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -22,12 +22,12 @@
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "lib/rx.h"
 #include "lib/debug.h"
 
 #include "mutt.h"
 
 #include "lib/rx.h"
 #include "lib/debug.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "sort.h"

diff --git a/browser.c b/browser.c
index 3999872..8bebbac 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -18,9 +18,9 @@
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mx.h"
 #include "mutt_menu.h"
 #include "buffy.h"
 #include "mx.h"
 #include "mutt_menu.h"
 #include "buffy.h"

diff --git a/commands.c b/commands.c
index d3ee541..cc78d45 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -20,9 +20,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "recvattach.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
 #include "sort.h"

diff --git a/compose.c b/compose.c
index 538d5ad..d352b84 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -24,9 +24,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 8645f67..809cec0 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -27,12 +27,12 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_menu.h"
 #include "handler.h"
 
 #include "mutt.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_menu.h"
 #include "handler.h"

-#include "enter.h"

 #include "copy.h"
 #include "pager.h"
 #include "recvattach.h"
 #include "copy.h"
 #include "pager.h"
 #include "recvattach.h"

diff --git a/imap/browse.c b/imap/browse.c
index a983c94..03586bc 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -22,10 +22,11 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 

+#include <lib-ui/enter.h>
+

 #include "lib/debug.h"
 
 #include "mutt.h"
 #include "lib/debug.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "imap_private.h"
 
 /* -- forward declarations -- */
 #include "imap_private.h"
 
 /* -- forward declarations -- */

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 7982dca..1c9e4bc 100644 (file)
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -30,9 +30,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "handler.h"
 #include "pgp.h"
 #include "copy.h"
 #include "handler.h"
 #include "pgp.h"
 #include "copy.h"

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index 1a49ec2..c397394 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -21,9 +21,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "recvattach.h"
 #include "mutt_menu.h"
 #include "pgp.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
 #include "pgp.h"

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 81bcfb8..d520287 100644 (file)
--- a/lib-crypt/smime.c
+++ b/lib-crypt/smime.c
@@ -21,9 +21,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "handler.h"
 #include "mutt_menu.h"
 #include "copy.h"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "copy.h"

diff --git a/lib-ui/Makefile.am b/lib-ui/Makefile.am
index d28b350..56039cd 100644 (file)
--- a/lib-ui/Makefile.am
+++ b/lib-ui/Makefile.am
@@ -1,7 +1,8 @@
 noinst_LIBRARIES = libui.a
 
 libui_a_SOURCES = curses.h     \
 noinst_LIBRARIES = libui.a
 
 libui_a_SOURCES = curses.h     \

-                 color.c curs_lib.c curs_main.c
+                 enter.h                                                    \
+                 enter.c color.c curs_lib.c curs_main.c

 
 noinst_HEADERS  = curses.h
 
 
 noinst_HEADERS  = curses.h
 

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index aaaf3ce..e618301 100644 (file)
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -21,9 +21,9 @@
 #include <lib-lib/file.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/file.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mutt_menu.h"
 #include "pager.h"
 #include "mbyte.h"
 #include "mutt_menu.h"
 #include "pager.h"
 #include "mbyte.h"

diff --git a/enter.c b/lib-ui/enter.c
similarity index 99%
rename from enter.c
rename to lib-ui/enter.c
index e4f1b10..0e13325 100644 (file)
--- a/enter.c
+++ b/lib-ui/enter.c
@@ -15,9 +15,9 @@
 #include <lib-lib/mem.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/mem.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mutt_menu.h"
 #include "keymap.h"
 #include "history.h"
 #include "mutt_menu.h"
 #include "keymap.h"
 #include "history.h"

diff --git a/enter.h b/lib-ui/enter.h
similarity index 100%
rename from enter.h
rename to lib-ui/enter.h

diff --git a/menu.c b/menu.c
index 5b37afe..4c58f1b 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -16,9 +16,9 @@
 #include <lib-lib/macros.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/macros.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mutt_menu.h"
 #include "mbyte.h"
 #include "sidebar.h"
 #include "mutt_menu.h"
 #include "mbyte.h"
 #include "sidebar.h"

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index f51bd2e..d912477 100644 (file)
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -19,8 +19,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 

+#include <lib-ui/enter.h>
+

 #include "mutt.h"
 #include "mutt.h"

-#include "enter.h"

 
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
 
 
 #if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))

diff --git a/muttlib.c b/muttlib.c
index d8f2d44..c8339ef 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -22,9 +22,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "mx.h"
 #include "url.h"
 #include "attach.h"
 #include "mx.h"
 #include "url.h"
 #include "attach.h"

diff --git a/pager.c b/pager.c
index c575e64..05c7688 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -21,9 +21,9 @@
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>
 #include <lib-lib/mapping.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "keymap.h"
 #include "mutt_menu.h"
 #include "sort.h"
 #include "keymap.h"
 #include "mutt_menu.h"
 #include "sort.h"

diff --git a/pattern.c b/pattern.c
index 35cdbd9..95157b1 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -21,9 +21,10 @@
 
 #include <lib-mime/mime.h>
 
 
 #include <lib-mime/mime.h>
 

+#include <lib-ui/enter.h>
+

 #include "mutt.h"
 #include "handler.h"
 #include "mutt.h"
 #include "handler.h"

-#include "enter.h"

 #include "mx.h"
 #include "keymap.h"
 #include "copy.h"
 #include "mx.h"
 #include "keymap.h"
 #include "copy.h"

diff --git a/postpone.c b/postpone.c
index 0d97216..1f5f000 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -21,8 +21,9 @@
 
 #include <lib-mime/mime.h>
 
 
 #include <lib-mime/mime.h>
 

+#include <lib-ui/enter.h>
+

 #include "mutt.h"
 #include "mutt.h"

-#include "enter.h"

 #include "handler.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "handler.h"
 #include "mutt_menu.h"
 #include "rfc1524.h"

diff --git a/recvattach.c b/recvattach.c
index d16a429..2a03049 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -22,9 +22,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"

diff --git a/recvcmd.c b/recvcmd.c
index 7e5adbd..39af5fa 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -20,9 +20,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "state.h"
 #include "handler.h"
 #include "recvattach.h"

diff --git a/send.c b/send.c
index f1c0749..613be76 100644 (file)
--- a/send.c
+++ b/send.c
@@ -20,9 +20,9 @@
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>

+#include <lib-ui/enter.h>

 
 #include "mutt.h"
 
 #include "mutt.h"

-#include "enter.h"

 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"
 #include "rfc3676.h"
 #include "keymap.h"
 #include "copy.h"