X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=9e7d4e4a3391423339bc932741300a0ff09d0227;hp=1b4e267dfbd318b596561d5ef9268e5de0600385;hb=bad8211c28d4b229878e0264012009493db48da5;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 1b4e267..9e7d4e4 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -21,6 +21,8 @@
 
 #include "lib/mem.h"
 #include "lib/intl.h"
+#include "lib/debug.h"
+#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -72,7 +74,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
   }
 
   strfcpy (t, c, sizeof (pop_data->err_msg) - strlen (pop_data->err_msg));
-  mutt_remove_trailing_ws (pop_data->err_msg);
+  str_skip_trailws (pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -258,7 +260,7 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
     return PQ_ERR;
   }
 
-#if (defined(USE_SSL) || defined(USE_GNUTLS)) && !defined(USE_NSS)
+#if (defined(USE_SSL) || defined(USE_GNUTLS))
   /* Attempt STLS if available and desired. */
   if (pop_data->cmd_stls && !pop_data->conn->ssf) {
     if (pop_data->use_stls == 0) {
@@ -388,7 +390,7 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, cha
   /* print msg instaed of real command */
   if (msg) {
     dbg = M_SOCK_LOG_FULL;
-    dprint (M_SOCK_LOG_CMD, (debugfile, "> %s", msg));
+    debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
   }
 #endif
 
@@ -482,7 +484,7 @@ static int check_uidl (char *line, void *data)
 
   sscanf (line, "%u %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++) {
-    if (!safe_strcmp (ctx->hdrs[i]->data, line)) {
+    if (!mutt_strcmp (ctx->hdrs[i]->data, line)) {
       ctx->hdrs[i]->refno = index;
       break;
     }