X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=b3bac5a5c93c7ca6fd0f23891ecb6fb29f150cff;hp=0052e5d8ef0ae003d951a3c3eb564eaf5c7579af;hb=8476307969a605bea67f6b702b0c1e7a52038bed;hpb=ac813896ca32d850febc2d95065ac4fa040f11f9

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 0052e5d..b3bac5a 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -7,23 +7,10 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
-#include "mx.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
 # include <lib-sys/mutt_ssl.h>
@@ -381,23 +368,14 @@ void pop_logout (CONTEXT * ctx)
  * -1 - conection lost,
  * -2 - invalid command or execution error.
 */
-pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
+pop_query_status pop_query (POP_DATA * pop_data, char *buf, size_t buflen)
 {
-  int dbg = M_SOCK_LOG_CMD;
   char *c;
 
   if (pop_data->status != POP_CONNECTED)
     return PQ_NOT_CONNECTED;
 
-#ifdef DEBUG
-  /* print msg instaed of real command */
-  if (msg) {
-    dbg = M_SOCK_LOG_FULL;
-    debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
-  }
-#endif
-
-  mutt_socket_write_d (pop_data->conn, buf, dbg);
+  mutt_socket_write(pop_data->conn, buf);
 
   c = strpbrk (buf, " \r\n");
   *c = '\0';
@@ -443,8 +421,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
 
   for (;;) {
     chunk =
-      mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
-                            M_SOCK_LOG_HDR);
+      mutt_socket_readln(buf, sizeof (buf), pop_data->conn);
     if (chunk < 0) {
       pop_data->status = POP_DISCONNECTED;
       ret = PQ_NOT_CONNECTED;