X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.h;h=fdd2ca3081add2a65592da41b436ad52e07ef1d1;hp=857f5940272eb2966e4c91613077663316ab8518;hb=0dc3054df348d3c9788ecf6aba028668c684a7bc;hpb=9a1805afc94b21d8766e6e67ef57f92aaf966e84

diff --git a/buffy.h b/buffy.h
index 857f594..fdd2ca3 100644
--- a/buffy.h
+++ b/buffy.h
@@ -9,17 +9,12 @@
 #ifndef _BUFFY_H
 #define _BUFFY_H
 
-#include "lib/list.h"
-
 /*parameter to mutt_parse_mailboxes*/
 #define M_MAILBOXES   1
 #define M_UNMAILBOXES 2
 
 typedef struct buffy_t {
   char *path;
-#ifdef BUFFY_SIZE
-  long size;
-#endif                          /* BUFFY_SIZE */
   short new;                    /* mailbox has new mail */
   short has_new;                /* set it new if new and not read */
   int msgcount;                 /* total number of messages */
@@ -30,8 +25,18 @@ typedef struct buffy_t {
   short newly_created;          /* mbox or mmdf just popped into existence */
 } BUFFY;
 
+DO_INIT(BUFFY, buffy);
+static inline void buffy_wipe(BUFFY *p) {
+    p_delete(&p->path);
+}
+DO_NEW(BUFFY, buffy);
+DO_DELETE(BUFFY, buffy);
+
+DO_ARRAY_TYPE(BUFFY, buffy);
+DO_ARRAY_FUNCS(BUFFY, buffy, buffy_delete);
+
 /* folders with incomming mail (via mailboxes command) */
-WHERE list2_t* Incoming;
+WHERE buffy_array Incoming;
 WHERE short BuffyTimeout INITVAL (3);
 extern time_t BuffyDoneTime;    /* last time we knew for sure how much mail there was */
 
@@ -48,9 +53,4 @@ int buffy_list (void);
 /* wrapper around buffy_list() */
 int buffy_notify (void);
 
-#ifdef BUFFY_SIZE
-BUFFY *buffy_find_mailbox (const char *path);
-void buffy_update_mailbox (BUFFY * b);
-#endif
-
 #endif /* !_BUFFY_H */