Make MAlias public. migrate $signature, so that I can test the new MCore.folder_hook...

[apps/madmutt.git] / lib-crypt / gnupgparse.c

diff --git a/lib-crypt/gnupgparse.c b/lib-crypt/gnupgparse.c
index 3db2f90..6be9f16 100644 (file)
--- a/lib-crypt/gnupgparse.c
+++ b/lib-crypt/gnupgparse.c
@@ -18,31 +18,15 @@
  * 
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-
 #include <lib-lib/lib-lib.h>
+
 #include <lib-mime/mime.h>
 #include <lib-sys/unix.h>
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
 
-
 /****************
  * Read the GNUPG keys.  For now we read the complete keyring by
  * calling gnupg in a special mode.
@@ -289,7 +273,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, string_list_t * hints)
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 
-  m_strreplace(&_chs, Charset);
+  m_strreplace(&_chs, MCharset.charset);
 
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
                                  keyring, hints);
@@ -326,7 +310,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, string_list_t * hints)
   if (ferror (fp))
     mutt_perror ("fgets");
 
-  fclose (fp);
+  m_fclose(&fp);
   mutt_wait_filter (thepid);
 
   close (devnull);