X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap_private.h;h=bebfc6a9def216b150895e3a99e33c72fa8f97be;hp=2a7a1f92dd65107618c5d161998df984c3de3b4f;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=5b0581b41f115cd0442037a97db313ef5b5b8822

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 2a7a1f9..bebfc6a 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -11,12 +11,10 @@
 #ifndef _IMAP_PRIVATE_H
 #define _IMAP_PRIVATE_H 1
 
-#include <inttypes.h>
-
-#include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
+#include <lib-ui/lib-ui.h>
 
 #include "imap.h"
-#include <lib-sys/mutt_socket.h>
 
 /* -- symbols -- */
 #define IMAP_PORT 143
@@ -116,10 +114,9 @@ typedef struct {
 
 /* IMAP command structure */
 typedef struct {
-  char seq[SEQLEN + 1];
-  char *buf;
-  unsigned int blen;
   int state;
+  char seq[SEQLEN + 1];
+  buffer_t buf;
 } IMAP_COMMAND;
 
 typedef struct {
@@ -127,6 +124,7 @@ typedef struct {
   CONNECTION *conn;
   unsigned char state;
   unsigned char status;
+  unsigned char isnew;
   /* let me explain capstr: SASL needs the capability string (not bits).
    * we have 3 options:
    *   1. rerun CAPABILITY inside SASL function.
@@ -140,6 +138,7 @@ typedef struct {
   unsigned int seqno;
   time_t lastread;              /* last time we read a command for the server */
   /* who knows, one day we may run multiple commands in parallel */
+
   IMAP_COMMAND cmd;
 
   /* The following data is all specific to the currently SELECTED mbox */
@@ -152,7 +151,7 @@ typedef struct {
   unsigned int newMailCount;
   IMAP_CACHE cache[IMAP_CACHE_LEN];
 #ifdef USE_HCACHE
-  unsigned long uid_validity;
+  long uid_validity;
 #endif
 
   /* all folder flags - system flags AND keywords */