X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Fimap_private.h;h=2a7a1f92dd65107618c5d161998df984c3de3b4f;hb=0dbe922d4298aed78dcba64b7c770f315a64505e;hp=03be3d38850856f3684ad58a98cf96c5c727a896;hpb=4b1dc0d42a3165db9201ba40af9ad041f33333a5;p=apps%2Fmadmutt.git

diff --git a/imap/imap_private.h b/imap/imap_private.h
index 03be3d3..2a7a1f9 100644
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -13,9 +13,10 @@
 
 #include <inttypes.h>
 
+#include <lib-ui/curses.h>
+
 #include "imap.h"
-#include "mutt_socket.h"
-#include "mutt_curses.h"
+#include <lib-sys/mutt_socket.h>
 
 /* -- symbols -- */
 #define IMAP_PORT 143
@@ -88,7 +89,6 @@ enum {
   AUTH_ANON,                    /* AUTH=ANONYMOUS */
   STARTTLS,                     /* RFC 2595: STARTTLS */
   LOGINDISABLED,                /*           LOGINDISABLED */
-  SASL_IR,                      /* SASL initial response draft */
 
   CAPMAX
 };
@@ -99,7 +99,7 @@ enum {
 
 /* -- data structures -- */
 typedef struct {
-  unsigned int uid;
+  int uid;
   char *path;
 } IMAP_CACHE;
 
@@ -156,7 +156,7 @@ typedef struct {
 #endif
 
   /* all folder flags - system flags AND keywords */
-  LIST *flags;
+  string_list_t *flags;
 } IMAP_DATA;
 
 /* I wish that were called IMAP_CONTEXT :( */
@@ -192,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);
@@ -204,7 +204,7 @@ void imap_error (const char *where, const char *msg);
 IMAP_DATA *imap_new_idata (void);
 void imap_free_idata (IMAP_DATA ** idata);
 char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
-                     size_t plen);
+                     ssize_t plen);
 int imap_get_literal_count (const char *buf, long *bytes);
 char *imap_get_qualifier (char *buf);
 char *imap_next_word (char *s);