remove some cruft

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

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index e34165b..38454ef 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,25 +11,24 @@
 # 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 "mutt.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
-# include "mutt_ssl.h"
+# include <lib-sys/mutt_ssl.h>
 #endif
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
 /* given an POP mailbox name, return host, port, username and password */
 int pop_parse_path (const char *path, ACCOUNT * acct)
 {
@@ -74,7 +73,7 @@ void pop_error (POP_DATA * pop_data, char *msg)
   }
 
   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 */