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

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 0052e5d..b5aa605 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -19,7 +19,6 @@
 #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 "mutt.h"
@@ -383,21 +382,12 @@ void pop_logout (CONTEXT * ctx)
 */
 pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg)
 {
-  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 +433,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;