X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap_private.h;h=eecc7981b10171b8ac3e34bbd2387372dbba09c9;hp=b2494cce2d09f66339e28edbd0a76482b3269186;hb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84;hpb=e76bc1577e47e0c9df150bc174d6fd8c76744308

diff --git a/imap/imap_private.h b/imap/imap_private.h
index b2494cc..eecc798 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
@@ -73,20 +75,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,7 +151,6 @@ 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
@@ -187,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);