projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
49c6fab
..
7c860de
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-12,6
+12,7
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "mx.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.h"
@@
-20,6
+21,7
@@
#include "browser.h"
#ifdef USE_IMAP
#include "imap.h"
#include "browser.h"
#ifdef USE_IMAP
#include "imap.h"
+#include "imap/mx_imap.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
@@
-270,7
+272,7
@@
static const char *folder_format_str (char *dest, size_t destlen, char op,
case 'N':
#ifdef USE_IMAP
case 'N':
#ifdef USE_IMAP
- if (
mx_get_magic (folder->ff->desc
) == M_IMAP) {
+ if (
imap_is_magic (folder->ff->desc, NULL
) == M_IMAP) {
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, folder->ff->new);
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, folder->ff->new);
@@
-476,7
+478,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/*
mutt_
buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
@@
-518,7
+520,7
@@
static int examine_directory (MUTTMENU * menu, struct browser_state *state,
return (-1);
}
return (-1);
}
-
mutt_
buffy_check (0);
+ buffy_check (0);
if ((dp = opendir (d)) == NULL) {
mutt_perror (d);
if ((dp = opendir (d)) == NULL) {
mutt_perror (d);
@@
-567,7
+569,7
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/*
mutt_
buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
@@
-588,26
+590,27
@@
static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
if (!Incoming)
return (-1);
if (!Incoming)
return (-1);
-
mutt_
buffy_check (0);
+ buffy_check (0);
init_state (state, menu);
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
init_state (state, menu);
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
+ tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
#ifdef USE_IMAP
- if (
mx_get_magic (tmp->path)
== M_IMAP) {
+ if (
tmp->magic
== M_IMAP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_POP
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_POP
- if (
mx_get_magic (tmp->path)
== M_POP) {
+ if (
tmp->magic
== M_POP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_NNTP
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_NNTP
- if (
mx_get_magic (tmp->path)
== M_NNTP) {
+ if (
tmp->magic
== M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
@@
-684,7
+687,7
@@
static void init_menu (struct browser_state *state, MUTTMENU * menu,
else
#endif
if (buffy)
else
#endif
if (buffy)
- snprintf (title, titlelen, _("Mailboxes [%d]"),
mutt_
buffy_check (0));
+ snprintf (title, titlelen, _("Mailboxes [%d]"), buffy_check (0));
else {
strfcpy (path, LastDir, sizeof (path));
mutt_pretty_mailbox (path);
else {
strfcpy (path, LastDir, sizeof (path));
mutt_pretty_mailbox (path);
@@
-764,7
+767,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
- if (
mx_get_magic (f
) == M_IMAP) {
+ if (
imap_is_magic (f, NULL
) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (f, &state);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (f, &state);
@@
-809,7
+812,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
#ifdef USE_IMAP
strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
#ifdef USE_IMAP
- if (!buffy &&
mx_get_magic (LastDir
) == M_IMAP) {
+ if (!buffy &&
imap_is_magic (LastDir, NULL
) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
@@
-1133,7
+1136,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
- if (
mx_get_magic (buf
) == M_IMAP) {
+ if (
imap_is_magic (buf, NULL
) == M_IMAP) {
strfcpy (LastDir, buf, sizeof (LastDir));
destroy_state (&state);
init_state (&state, NULL);
strfcpy (LastDir, buf, sizeof (LastDir));
destroy_state (&state);
init_state (&state, NULL);
@@
-1290,7
+1293,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
goto bail;
}
#ifdef USE_IMAP
goto bail;
}
#ifdef USE_IMAP
- else if (
mx_get_magic (LastDir
) == M_IMAP) {
+ else if (
imap_is_magic (LastDir, NULL
) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
@@
-1303,7
+1306,7
@@
void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
break;
case OP_BUFFY_LIST:
break;
case OP_BUFFY_LIST:
-
mutt_
buffy_list ();
+ buffy_list ();
break;
case OP_BROWSER_NEW_FILE:
break;
case OP_BROWSER_NEW_FILE: