# include "config.h"
#endif
+#include <stdlib.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 <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "lib/list.h"
-#include <stdlib.h>
-#include <dirent.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-
static struct mapping_t FolderHelp[] = {
{N_("Exit"), OP_EXIT},
{N_("Chdir"), OP_CHANGE_DIRECTORY},
else
#endif
{
- unsigned int i = 0;
+ int i = 0;
BUFFY* tmp;
if (!Incoming)
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
case OP_CATCHUP:
case OP_UNCATCHUP:
if (option (OPTNEWS)) {
- struct folder_file *f = &state.entry[menu->current];
+ struct folder_file *folder_f = &state.entry[menu->current];
NNTP_DATA *nd;
if (i == OP_CATCHUP)
- nd = mutt_newsgroup_catchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_catchup (CurrentNewsSrv, folder_f->name);
else
- nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, f->name);
+ nd = mutt_newsgroup_uncatchup (CurrentNewsSrv, folder_f->name);
if (nd) {
-/* FOLDER folder;
- struct folder_file ff;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.ff = &ff;
- folder.ff->name = f->name;
- folder.ff->st = NULL;
- folder.ff->is_new = nd->new;
- folder.ff->nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer); */
if (menu->current + 1 < menu->max)
menu->current++;
menu->redraw = REDRAW_MOTION_RESYNCH;
}
for (; j < state.entrylen; j++) {
- struct folder_file *f = &state.entry[j];
+ struct folder_file *folderf = &state.entry[j];
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE ||
- regexec (rx, f->name, 0, NULL, 0) == 0) {
+ regexec (rx, folderf->name, 0, NULL, 0) == 0) {
if (i == OP_BROWSER_SUBSCRIBE || i == OP_SUBSCRIBE_PATTERN)
- nd = mutt_newsgroup_subscribe (news, f->name);
+ nd = mutt_newsgroup_subscribe (news, folderf->name);
else
- nd = mutt_newsgroup_unsubscribe (news, f->name);
-/* if (nd)
- {
- FOLDER folder;
- char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-
- folder.name = f->name;
- folder.f = NULL;
- folder.new = nd->new;
- folder.nd = nd;
- p_delete(&f->desc);
- mutt_FormatString (buffer, sizeof (buffer), NONULL(GroupFormat),
- newsgroup_format_str, (unsigned long) &folder,
- M_FORMAT_ARROWCURSOR);
- f->desc = m_strdup(buffer);
- } */
+ nd = mutt_newsgroup_unsubscribe (news, folderf->name);
}
if (i == OP_BROWSER_SUBSCRIBE || i == OP_BROWSER_UNSUBSCRIBE) {
if (menu->current + 1 < menu->max)