X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fimap_private.h;h=2e9095c0b0d2eec419c186c2c4ebfb17399006ab;hb=7d6add87dcf687d93906c297d335029effbed909;hp=dcf0c960102a0340750231f8d5bf6f4c64120c21;hpb=8e6b42b9b28f646a6764936d80bda04647d5b45f;p=apps%2Fmadmutt.git

diff --git a/imap/imap_private.h b/imap/imap_private.h
index dcf0c96..2e9095c 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -13,8 +13,10 @@
 
 #include <inttypes.h>
 
+#include <lib-ui/curses.h>
+
 #include "imap.h"
-#include "mutt_socket.h"
+#include <lib-sys/mutt_socket.h>
 
 /* -- symbols -- */
 #define IMAP_PORT 143
@@ -149,13 +151,12 @@ typedef struct {
   unsigned char rights[(RIGHTSMAX + 7) / 8];
   unsigned int newMailCount;
   IMAP_CACHE cache[IMAP_CACHE_LEN];
-  int noclose:1;
 #ifdef USE_HCACHE
   unsigned long uid_validity;
 #endif
 
   /* all folder flags - system flags AND keywords */
-  LIST *flags;
+  string_list_t *flags;
 } IMAP_DATA;
 
 /* I wish that were called IMAP_CONTEXT :( */
@@ -174,7 +175,7 @@ int imap_open_connection (IMAP_DATA * idata);
 IMAP_DATA *imap_conn_find (const ACCOUNT * account, int flags);
 int imap_parse_list_response (IMAP_DATA * idata, char **name, int *noselect,
                               int *noinferiors, char *delim);
-int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes);
+int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t*);
 void imap_expunge_mailbox (IMAP_DATA * idata);
 int imap_reconnect (CONTEXT * ctx);
 void imap_logout (IMAP_DATA * idata);
@@ -191,7 +192,7 @@ int imap_code (const char *s);
 int imap_exec (IMAP_DATA * idata, const char *cmd, int flags);
 
 /* message.c */
-void imap_add_keywords (char *s, HEADER * keywords, LIST * mailbox_flags,
+void imap_add_keywords (char *s, HEADER * keywords, string_list_t * mailbox_flags,
                         size_t slen);
 void imap_free_header_data (void **data);
 int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend);