X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=bc868e3c9c3d20734d8643e7b669cbb4fad91976;hb=bd5c6e968ae1f29f5819d1e39ec104cc632ad545;hp=94b1d6faec8f2229456dcd37e1d25aa4ff912c41;hpb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 94b1d6f..bc868e3 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -10,27 +10,22 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/sidebar.h>
 
 #include <pop/pop.h>
 
+#include "curses.h"
+#include "menu.h"
+
 #include "mutt.h"
+#include "alias.h"
 #include "mx.h"
-#include "mutt_menu.h"
 #include "sort.h"
 #include "recvattach.h"
 #include "buffy.h"
 #include "mx.h"
-#include "sidebar.h"
 #include "thread.h"
 #include "xterm.h"
 
@@ -46,16 +41,6 @@
 #include "mutt_sasl.h"
 #endif
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <errno.h>
-
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
@@ -605,8 +590,6 @@ int mutt_index_menu (void)
 
       op = km_dokey (MENU_MAIN);
 
-      debug_print (4, ("Got op %d\n", op));
-
       if (op == -1)
         continue;               /* either user abort or timeout */
 
@@ -752,7 +735,7 @@ int mutt_index_menu (void)
             break;
         }
         else {
-          LIST *ref = CURHDR->env->references;
+          string_list_t *ref = CURHDR->env->references;
 
           if (!ref) {
             mutt_error (_("Article has no parent reference!"));
@@ -808,7 +791,7 @@ int mutt_index_menu (void)
         m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
 
         if (op == OP_RECONSTRUCT_THREAD) {
-          LIST *ref = CURHDR->env->references;
+          string_list_t *ref = CURHDR->env->references;
 
           while (ref) {
             nntp_check_msgid (Context, ref->data);