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]
/
buffy.c
diff --git
a/buffy.c
b/buffy.c
index
ac8ef46
..
a929fe6
100644
(file)
--- a/
buffy.c
+++ b/
buffy.c
@@
-16,6
+16,7
@@
#include "mutt.h"
#include "buffy.h"
#include "mutt.h"
#include "buffy.h"
+#include "buffer.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
#include "mx.h"
#include "mh.h"
#include "sidebar.h"
@@
-169,8
+170,8
@@
void buffy_update_mailbox (BUFFY * b)
/* func to free buffy for list_del() */
static void buffy_free (BUFFY** p) {
/* func to free buffy for list_del() */
static void buffy_free (BUFFY** p) {
-
FREE
(&(*p)->path);
-
FREE
(p);
+
mem_free
(&(*p)->path);
+
mem_free
(p);
}
int buffy_lookup (const char* path) {
}
int buffy_lookup (const char* path) {
@@
-198,7
+199,7
@@
int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
mutt_extract_token (path, s, 0);
strfcpy (buf, path->data, sizeof (buf));
mutt_extract_token (path, s, 0);
strfcpy (buf, path->data, sizeof (buf));
- if (data == M_UNMAILBOXES && str_eq (buf, "*")
== 0
) {
+ if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
list_del (&Incoming, (list_del_t*) buffy_free);
return 0;
}
list_del (&Incoming, (list_del_t*) buffy_free);
return 0;
}
@@
-219,7
+220,7
@@
int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
}
if (i < 0) {
}
if (i < 0) {
- tmp =
safe
_calloc (1, sizeof (BUFFY));
+ tmp =
mem
_calloc (1, sizeof (BUFFY));
tmp->path = str_dup (buf);
tmp->magic = 0;
list_push_back (&Incoming, tmp);
tmp->path = str_dup (buf);
tmp->magic = 0;
list_push_back (&Incoming, tmp);
@@
-505,9
+506,6
@@
int buffy_list (void)
int have_unnotified = BuffyNotify;
int i = 0;
int have_unnotified = BuffyNotify;
int i = 0;
- if (option (OPTFORCEBUFFYCHECK))
- buffy_check (1);
-
pos = 0;
first = 1;
buffylist[0] = 0;
pos = 0;
first = 1;
buffylist[0] = 0;