projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_tempfile instead of mutt_mktemp
[apps/madmutt.git]
/
lib-ui
/
curs_main.c
diff --git
a/lib-ui/curs_main.c
b/lib-ui/curs_main.c
index
94b1d6f
..
6e20d66
100644
(file)
--- a/
lib-ui/curs_main.c
+++ b/
lib-ui/curs_main.c
@@
-10,27
+10,21
@@
* please see the file GPL in the top level source directory.
*/
* 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 <lib-mx/mx.h>
#include <pop/pop.h>
#include <pop/pop.h>
+#include "curses.h"
+#include "menu.h"
+
#include "mutt.h"
#include "mutt.h"
-#include "mx.h"
-#include "mutt_menu.h"
+#include "alias.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
-#include "mx.h"
-#include "sidebar.h"
#include "thread.h"
#include "xterm.h"
#include "thread.h"
#include "xterm.h"
@@
-46,16
+40,6
@@
#include "mutt_sasl.h"
#endif
#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.");
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.");
@@
-491,7
+475,7
@@
int mutt_index_menu (void)
("Mailbox was externally modified. Flags may be wrong."));
else if (check == M_NEW_MAIL) {
/* on new mail: redraw sidebar */
("Mailbox was externally modified. Flags may be wrong."));
else if (check == M_NEW_MAIL) {
/* on new mail: redraw sidebar */
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
mutt_message (_("New mail in this mailbox."));
if (option (OPTBEEPNEW))
mutt_message (_("New mail in this mailbox."));
if (option (OPTBEEPNEW))
@@
-531,10
+515,10
@@
int mutt_index_menu (void)
if (op != -1)
mutt_curs_set (0);
if (menu->redraw & REDRAW_SIDEBAR)
if (op != -1)
mutt_curs_set (0);
if (menu->redraw & REDRAW_SIDEBAR)
- sidebar_draw (
menu->menu
);
+ sidebar_draw ();
if (menu->redraw & REDRAW_FULL) {
menu_redraw_full (menu);
if (menu->redraw & REDRAW_FULL) {
menu_redraw_full (menu);
- sidebar_draw (
menu->menu
);
+ sidebar_draw ();
mutt_show_error ();
}
mutt_show_error ();
}
@@
-605,8
+589,6
@@
int mutt_index_menu (void)
op = km_dokey (MENU_MAIN);
op = km_dokey (MENU_MAIN);
- debug_print (4, ("Got op %d\n", op));
-
if (op == -1)
continue; /* either user abort or timeout */
if (op == -1)
continue; /* either user abort or timeout */
@@
-752,7
+734,7
@@
int mutt_index_menu (void)
break;
}
else {
break;
}
else {
-
LIST
*ref = CURHDR->env->references;
+
string_list_t
*ref = CURHDR->env->references;
if (!ref) {
mutt_error (_("Article has no parent reference!"));
if (!ref) {
mutt_error (_("Article has no parent reference!"));
@@
-808,7
+790,7
@@
int mutt_index_menu (void)
m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
if (op == OP_RECONSTRUCT_THREAD) {
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);
while (ref) {
nntp_check_msgid (Context, ref->data);
@@
-1227,7
+1209,7
@@
int mutt_index_menu (void)
if (Context) {
int check;
if (Context) {
int check;
- if (Context->c
ompress
info && Context->realpath)
+ if (Context->cinfo && Context->realpath)
m_strreplace(&LastFolder, Context->realpath);
else
m_strreplace(&LastFolder, Context->path);
m_strreplace(&LastFolder, Context->realpath);
else
m_strreplace(&LastFolder, Context->path);
@@
-2325,7
+2307,7
@@
int mutt_index_menu (void)
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_NEXT_NEW:
case OP_SIDEBAR_PREV_NEW:
case OP_SIDEBAR_PREV:
case OP_SIDEBAR_NEXT_NEW:
case OP_SIDEBAR_PREV_NEW:
- sidebar_scroll (op
, menu->menu
);
+ sidebar_scroll (op);
break;
default:
if (menu->menu == MENU_MAIN)
break;
default:
if (menu->menu == MENU_MAIN)