X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop_lib.c;h=22b2eaa01cc8dd3dc9f94700c9cab4c4df8fad87;hb=b85f52d2ec4d820ab5c4b577857548bec294bb27;hp=143868e4c33863b46430b58c23f7e6e641645e89;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258;p=apps%2Fmadmutt.git

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 143868e..22b2eaa 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -12,10 +12,11 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
 # include "mutt_ssl.h"
 #endif
 
@@ -160,6 +161,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
         pop_data->cmd_capa = CMD_AVAILABLE;
         break;
       }
+    case PFD_FUNCT_ERROR:
     case PQ_ERR:
       {
         pop_data->cmd_capa = CMD_NOT_AVAILABLE;
@@ -283,10 +285,8 @@ pop_query_status pop_open_connection (POP_DATA * pop_data)
         mutt_error ("%s", pop_data->err_msg);
         mutt_sleep (2);
       }
-#ifdef USE_SSL
+#if defined (USE_SSL) || defined (USE_GNUTLS)
       else if (mutt_ssl_starttls (pop_data->conn))
-#elif USE_GNUTLS
-      else if (mutt_gnutls_starttls (pop_data->conn))
 #endif
       {
         mutt_error (_("Could not negotiate TLS connection"));