X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=0c7af826a0153a5669533e27eacc882d98618b48;hb=50c675dd588194577627503a2416df20c710bf51;hp=ae2bec1e46cf19f2916bf5bdc5c2886d213a5a7e;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index ae2bec1..0c7af82 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -26,12 +26,11 @@
 #include "mx.h"
 #include "mx_nntp.h"
 #include "rfc1524.h"
-#include "rfc2047.h"
 #include "nntp.h"
 #include "sidebar.h"
 #include "buffy.h"
 
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 #include "lib/debug.h"
 
@@ -160,9 +159,9 @@ static int nntp_connect_and_auth (NNTP_SERVER * serv)
   else if (!m_strncmp("201", buf, 3))
     mutt_message (_("Connected to %s. Posting NOT ok."), conn->account.host);
   else {
-    mutt_socket_close (conn);
-    str_skip_trailws (buf);
-    mutt_error ("%s", buf);
+    mutt_socket_close(conn);
+    m_strrtrim(buf);
+    mutt_error("%s", buf);
     sleep (2);
     return -1;
   }
@@ -621,7 +620,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->env->xref = m_strdup(b);
       nntp_parse_xref (ctx, nntp_data->group, b, hdr);
     }
-    rfc2047_decode_envelope (hdr->env);
+    rfc2047_decode_envelope(hdr->env);
     if (!*p)
       return -1;
     b = p;