X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.h;h=6e857c09fb2f758f411bd32097c273598ac466f3;hb=f779db722043d8c6767149a9afef8c10159516f5;hp=495849b534d2a8eadbf83d0e9b6ff13d70cb9188;hpb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;p=apps%2Fmadmutt.git

diff --git a/pop/pop.h b/pop/pop.h
index 495849b..6e857c0 100644
--- a/pop/pop.h
+++ b/pop/pop.h
@@ -11,9 +11,9 @@
 #define _POP_H 1
 
 #include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
 
 #include "mx.h"
-#include <lib-network/mutt_socket.h>
 
 #define POP_PORT 110
 #define POP_SSL_PORT 995
@@ -40,7 +40,7 @@ typedef enum {
 } pop_auth_res_t;
 
 typedef struct {
-  unsigned int index;
+  int index;
   char *path;
 } POP_CACHE;
 
@@ -92,11 +92,10 @@ 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, const char *);
+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 *);