projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
list2_t --
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
7fc0335
..
93a5d76
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-7,29
+7,16
@@
* 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/lib-lib.h>
-#include <stdlib.h>
#include <dirent.h>
#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
#include <pwd.h>
#include <grp.h>
#include <pwd.h>
#include <grp.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
-
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
#include "mutt.h"
#include "mx.h"
#include "mutt.h"
#include "mx.h"
@@
-43,9
+30,6
@@
#ifdef USE_NNTP
#include "nntp.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
#endif
-#include "sidebar.h"
-
-#include "lib/list.h"
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
@@
-490,7
+474,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
add_folder (menu, state, data->group, NULL, data->new);
#endif
}
add_folder (menu, state, data->group, NULL, data->new);
#endif
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
}
else
#endif /* USE_NNTP */
}
else
#endif /* USE_NNTP */
@@
-556,7
+540,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
}
closedir (dp);
}
}
closedir (dp);
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
browser_sort (state);
return 0;
}
browser_sort (state);
return 0;
}
@@
-584,7
+568,7
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
(!option (OPTSHOWONLYUNREAD)|| data->unread))))
add_folder (menu, state, data->group, NULL, data, data->new);
}
- sidebar_draw (
CurrentMenu
);
+ sidebar_draw ();
}
else
#endif
}
else
#endif
@@
-1339,7
+1323,7
@@
void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
b = mutt_make_file_attach (nbuf);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
b = mutt_make_file_attach (nbuf);
if (b != NULL) {
mutt_view_attachment (NULL, b, M_REGULAR, NULL, NULL, 0);
-
mutt_free_body
(&b);
+
body_list_wipe
(&b);
menu->redraw = REDRAW_FULL;
}
else
menu->redraw = REDRAW_FULL;
}
else