Rocco Rutte:

[apps/madmutt.git] / pop / pop_lib.c

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index f63e4f7..9e7d4e4 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -22,6 +22,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
+#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -73,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 */
@@ -259,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) {
@@ -483,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;
     }