X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.h;h=da5259311f2cc50b992fcf186d0d722a5bab6a64;hb=20deb4ce5f654f7c112a7a4c1cf154d00847cf30;hp=bbafe1f025389a9c709dfa1df8b3fb4324d09835;hpb=4711a1a970ba7dda6eaf71f16fdfd74f90d02bb8;p=apps%2Fmadmutt.git

diff --git a/pop/pop.h b/pop/pop.h
index bbafe1f..da52593 100644
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -10,9 +10,13 @@
 #ifndef _POP_H
 #define _POP_H 1
 
-#include "mx.h"
-#include "mutt_socket.h"
-#include "mutt_curses.h"
+#include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
+#include <lib-mx/mx.h>
+
+
+extern mx_t const pop_mx;
+
 
 #define POP_PORT 110
 #define POP_SSL_PORT 995
@@ -39,7 +43,7 @@ typedef enum {
 } pop_auth_res_t;
 
 typedef struct {
-  unsigned int index;
+  int index;
   char *path;
 } POP_CACHE;
 
@@ -91,23 +95,18 @@ int pop_authenticate (POP_DATA *);
 void pop_apop_timestamp (POP_DATA *, char *);
 
 /* pop_lib.c */
-#define pop_query(A,B,C) pop_query_d(A,B,C,NULL)
 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 *, progress_t*, int (*funct) (char *, void *),
-                    void *);
+pop_query_status pop_query (POP_DATA *, char *, size_t);
+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);
-int pop_open_mailbox (CONTEXT *);
-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);
 
 #endif