X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=e462a6a74b1e44ea6d668104e70acefb95778f51;hp=763dffc3051ed1bd8d8be82ce803a3604cf48adc;hb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 763dffc..e462a6a 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -21,7 +21,7 @@
 #include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-network/mutt_ssl.h>
 #endif
 
 #include "lib/debug.h"
@@ -68,15 +68,13 @@ void pop_error (POP_DATA * pop_data, char *msg)
   c = msg;
 
   if (!m_strncmp(msg, "-ERR ", 5)) {
-    c2 = msg + 5;
-    SKIPWS (c2);
-
+    c2 = vskipspaces(msg + 5);
     if (*c2)
       c = c2;
   }
 
   m_strcpy(t, sizeof(pop_data->err_msg) - strlen(pop_data->err_msg), c);
-  str_skip_trailws (pop_data->err_msg);
+  m_strrtrim(pop_data->err_msg);
 }
 
 /* Parse CAPA output */
@@ -87,8 +85,7 @@ static int fetch_capa (char *line, void *data)
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
     p_delete(&pop_data->auth_list);
-    c = line + 4;
-    SKIPWS (c);
+    c = vskipspaces(line + 4);
     pop_data->auth_list = m_strdup(c);
   }