more include simplifications

[apps/madmutt.git] / pop / pop.h

diff --git a/pop/pop.h b/pop/pop.h
index 5821491..3d3f4b5 100644 (file)
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -10,8 +10,10 @@
 #ifndef _POP_H
 #define _POP_H 1
 
-#include "mailbox.h"
-#include "mutt_socket.h"
+#include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
+
+#include "mx.h"
 
 #define POP_PORT 110
 #define POP_SSL_PORT 995
@@ -38,7 +40,7 @@ typedef enum {
 } pop_auth_res_t;
 
 typedef struct {
-  unsigned int index;
+  int index;
   char *path;
 } POP_CACHE;
 
@@ -94,17 +96,17 @@ void pop_apop_timestamp (POP_DATA *, char *);
 int pop_parse_path (const char *, ACCOUNT *);
 int pop_connect (POP_DATA *);
 pop_query_status pop_open_connection (POP_DATA *);
-pop_query_status pop_query_d (POP_DATA *, char *, size_t, char *);
-pop_query_status pop_fetch_data (POP_DATA *, char *, char *, int (*funct) (char *, void *),
-                    void *);
+pop_query_status pop_query_d (POP_DATA *, char *, size_t, const char *);
+pop_query_status pop_fetch_data (POP_DATA *, const char *, progress_t*,
+                                 int (*funct) (char *, void *), void *);
 pop_query_status pop_reconnect (CONTEXT *);
 void pop_logout (CONTEXT *);
 void pop_error (POP_DATA *, char *);
 
 /* pop.c */
-int pop_check_mailbox (CONTEXT *, int *);
+int pop_check_mailbox (CONTEXT *, int *, int);
 int pop_open_mailbox (CONTEXT *);
-pop_query_status pop_sync_mailbox (CONTEXT *, int *);
+pop_query_status pop_sync_mailbox (CONTEXT *, int, int *);
 int pop_fetch_message (MESSAGE *, CONTEXT *, int);
 void pop_close_mailbox (CONTEXT *);
 void pop_fetch_mail (void);