X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_ssl.cpkg;h=3717ba4f752aa94bea2ae0958ef0f899621ce9f5;hp=1b9e5d1917548635a52d210da1acfc138422a4b4;hb=f5276054ef65648b1d1ab00664c0a3ea6879cf39;hpb=4f1b1414371cc373f50ca79a888928635a3a3763

diff --git a/lib-sys/mutt_ssl.cpkg b/lib-sys/mutt_ssl.cpkg
index 1b9e5d1..3717ba4 100644
--- a/lib-sys/mutt_ssl.cpkg
+++ b/lib-sys/mutt_ssl.cpkg
@@ -12,11 +12,8 @@
 
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
-#ifdef HAVE_GNUTLS_OPENSSL_H
-#include <gnutls/openssl.h>
-#endif
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
@@ -62,7 +59,7 @@
      ** the default from the GNUTLS library.
      */
 
-    path_t cert_file = m_strdup("~/.cache/madmutt/certificates");
+    path_t cert_file = luaM_pathnew("~/.cache/madmutt/certificates");
     /*
      ** .pp
      ** This variable specifies the file where the certificates you trust
@@ -496,8 +493,6 @@ static int tls_check_certificate (CONNECTION * conn)
 {
   tlssockdata *data = conn->sockdata;
   gnutls_session state = data->state;
-  char helpstr[STRING];
-  char buf[STRING];
   char fpbuf[STRING];
   ssize_t buflen;
   char dn_common_name[STRING];
@@ -791,13 +786,6 @@ static int tls_check_certificate (CONNECTION * conn)
     menu->keys = _("ro");
   }
 
-  helpstr[0] = '\0';
-  mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_GENERIC, OP_EXIT);
-  strncat (helpstr, buf, sizeof (helpstr));
-  mutt_make_help (buf, sizeof (buf), _("Help"), MENU_GENERIC, OP_HELP);
-  strncat (helpstr, buf, sizeof (helpstr));
-  menu->help = helpstr;
-
   done = 0;
   set_option (OPTUNBUFFEREDINPUT);
   while (!done) {