move more files.

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

diff --git a/Makefile.am b/Makefile.am
index 63901d9..f0497e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,14 +18,12 @@ DISTCLEANFILES = $(BUILT_SOURCES)
 
 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  \
+       alias.c attach.c base64.c browser.c buffy.c charset.c compress.c commands.c \
        compose.c copy.c editmsg.c init.c keymap.c lib.c \
-       flags.c filter.c from.c handler.c hcache.c headers.c help.c hook.c \
+       flags.c from.c handler.c hcache.c headers.c help.c hook.c \
        main.c mbox.c mh.c muttlib.c mutt_idna.c mx.c \
-       pager.c pattern.c postpone.c query.c recvattach.c recvcmd.c \
-       score.c send.c sendlib.c sort.c state.c status.c \
-       thread.c account.c
+       pager.c pattern.c postpone.c recvattach.c recvcmd.c \
+       score.c send.c sendlib.c sort.c state.c thread.c account.c
 
 madmutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ \
               -Limap -limap -Lpop -lpop $(LIBNNTP) \

diff --git a/lib-sys/Makefile.am b/lib-sys/Makefile.am
index e73c14f..20ce69f 100644 (file)
--- a/lib-sys/Makefile.am
+++ b/lib-sys/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LIBRARIES = libsys.a
 
 libsys_a_SOURCES = exit.h unix.h mutt_signal.h \
-                  exit.c unix.c mutt_signal.c \
+                  exit.c unix.c mutt_signal.c filter.c \
                   $(___networking_part____) \
                   mutt_socket.h mutt_tunnel.c mutt_ssl.h \
                   mutt_socket.c mutt_tunnel.h mutt_ssl.c mutt_ssl_gnutls.c

diff --git a/filter.c b/lib-sys/filter.c
similarity index 97%
rename from filter.c
rename to lib-sys/filter.c
index ef052b5..193b2ad 100644 (file)
--- a/filter.c
+++ b/lib-sys/filter.c
@@ -14,10 +14,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/wait.h>
+#include <stdio.h>
 
-#include <lib-sys/mutt_signal.h>
-
-#include "mutt.h"
+#include "mutt_signal.h"
+#include "unix.h"
 
 /* Invokes a commmand on a pipe and optionally connects its stdin and stdout
  * to the specified handles.

diff --git a/lib-sys/unix.h b/lib-sys/unix.h
index 43e9340..e392c4e 100644 (file)
--- a/lib-sys/unix.h
+++ b/lib-sys/unix.h
@@ -35,4 +35,10 @@ int getdnsdomainname(char *, ssize_t);
 int _mutt_system (const char *, int);
 
 
+pid_t mutt_create_filter (const char *, FILE **, FILE **, FILE **);
+pid_t mutt_create_filter_fd (const char *, FILE **, FILE **, FILE **, int,
+                             int, int);
+int mutt_wait_filter (pid_t);
+
+
 #endif /* MUTT_LIB_SYS_UNIX_H */

diff --git a/lib-ui/Makefile.am b/lib-ui/Makefile.am
index d79b1f5..4461598 100644 (file)
--- a/lib-ui/Makefile.am
+++ b/lib-ui/Makefile.am
@@ -2,7 +2,8 @@ noinst_LIBRARIES = libui.a
 
 libui_a_SOURCES = curses.h enter.h menu.h history.h sidebar.h \
                           enter.c menu.c history.c sidebar.c \
-                 color.c curs_lib.c curs_main.c resize.c hdrline.c
+                 color.c curs_lib.c curs_main.c resize.c     \
+                 hdrline.c status.c complete.c query.c
 
 noinst_HEADERS  = curses.h enter.h menu.h history.h sidebar.h
 

diff --git a/complete.c b/lib-ui/complete.c
similarity index 99%
rename from complete.c
rename to lib-ui/complete.c
index 2fd849a..2ad60ac 100644 (file)
--- a/complete.c
+++ b/lib-ui/complete.c
@@ -24,7 +24,7 @@
 #include "mx.h"
 #include <imap/imap.h>
 #ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
 #endif
 
 /* given a partial pathname, this routine fills in as much of the rest of the

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

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

diff --git a/protos.h b/protos.h
index bff2205..0b5dc6e 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -226,7 +226,6 @@ int mutt_compose_menu (HEADER *, char *, ssize_t, HEADER *);
 int mutt_thread_set_flag (HEADER *, int, int, int);
 int mutt_user_is_recipient (HEADER *);
 void mutt_update_num_postponed (void);
-int mutt_wait_filter (pid_t);
 int mutt_which_case (const char *);
 int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, int,
                     char *);
@@ -240,10 +239,6 @@ int mutt_save_confirm (const char *, struct stat *);
 
 int mh_valid_message (const char *);
 
-pid_t mutt_create_filter (const char *, FILE **, FILE **, FILE **);
-pid_t mutt_create_filter_fd (const char *, FILE **, FILE **, FILE **, int,
-                             int, int);
-
 /* base64.c */
 void mutt_to_base64 (unsigned char *, const unsigned char *, ssize_t, ssize_t);
 int mutt_from_base64 (char *, const char *);

diff --git a/recvcmd.c b/recvcmd.c
index 046f83d..5b1cfaa 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -115,9 +115,7 @@ static short count_tagged_children (ATTACHPTR ** idx, short idxlen, short i)
 
 
 /**
- **
  ** The bounce function, from the attachment menu
- **
  **/
 
 void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
@@ -211,10 +209,7 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
 
 /**
- **
  ** resend-message, from the attachment menu 
- **
- **
  **/
 
 void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTACHPTR ** idx,
@@ -236,9 +231,7 @@ void mutt_attach_resend (FILE * fp, HEADER * hdr __attribute__ ((unused)), ATTAC
 \f
 
 /**
- **
  ** forward-message, from the attachment menu 
- **
  **/
 
 /* try to find a common parent message for the tagged attachments. */
@@ -640,10 +633,7 @@ void mutt_attach_forward (FILE * fp, HEADER * hdr,
 
 
 /**
- ** 
  ** the various reply functions, from the attachment menu
- **
- **
  **/
 
 /* Create the envelope defaults for a reply.