workaround a stupid issue in how decoding is performed in mutt *sigh*

[apps/madmutt.git] / pop.c

diff --git a/pop.c b/pop.c
index f173d6e..a066f6e 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -13,7 +13,7 @@
 #include <sasl/saslutil.h>
 
 #include <lib-sys/mutt_socket.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include "crypt.h"
 #include "mutt.h"
@@ -416,6 +416,7 @@ static pop_query_status pop_authenticate (pop_data_t * pop_data)
                     attempts++;
                     break;
                 }
+                mutt_socket_close(pop_data->conn);
             }
         }
     } else {
@@ -431,6 +432,7 @@ static pop_query_status pop_authenticate (pop_data_t * pop_data)
                 attempts++;
                 break;
             }
+            mutt_socket_close(pop_data->conn);
         }
     }
 
@@ -1393,7 +1395,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     bar.msg = _("Fetching message...");
     mutt_progress_bar (&bar, 0);
 
-    msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
+    msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
     if (!msg->fp) {
       mutt_error(_("Could not create temporary file"));
       mutt_sleep(2);