warning fixes

[apps/madmutt.git] / imap / imap_private.h

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 91ae379..0c91e7e 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -15,6 +15,7 @@
 
 #include "imap.h"
 #include "mutt_socket.h"
+#include "mutt_curses.h"
 
 /* -- symbols -- */
 #define IMAP_PORT 143
@@ -73,20 +74,7 @@ enum {
   IMAP_NS_SHARED
 };
 
-/* ACL Rights */
-enum {
-  IMAP_ACL_LOOKUP = 0,
-  IMAP_ACL_READ,
-  IMAP_ACL_SEEN,
-  IMAP_ACL_WRITE,
-  IMAP_ACL_INSERT,
-  IMAP_ACL_POST,
-  IMAP_ACL_CREATE,
-  IMAP_ACL_DELETE,
-  IMAP_ACL_ADMIN,
-
-  RIGHTSMAX
-};
+/* ACL Rights are moved to ../mx.h */
 
 /* Capabilities we are interested in */
 enum {
@@ -162,9 +150,8 @@ typedef struct {
   unsigned char rights[(RIGHTSMAX + 7) / 8];
   unsigned int newMailCount;
   IMAP_CACHE cache[IMAP_CACHE_LEN];
-  int noclose:1;
 #ifdef USE_HCACHE
-  uint64_t uid_validity;
+  unsigned long uid_validity;
 #endif
 
   /* all folder flags - system flags AND keywords */
@@ -187,10 +174,11 @@ 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);
+int imap_sync_message (IMAP_DATA*, HEADER*, BUFFER*, int*);
 
 /* auth.c */
 int imap_authenticate (IMAP_DATA * idata);