X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-crypt%2Fgnupgparse.c;h=6be9f16e7352a6741e16c450c2d14bdcf4bf7e75;hb=8f75834aeadb902879602a82a259f4d3bf9c569c;hp=594346724e990f61abf52294be4b3701f7ba7e77;hpb=1ee89902de184a640c171ae3285bff6882a791bd;p=apps%2Fmadmutt.git

diff --git a/lib-crypt/gnupgparse.c b/lib-crypt/gnupgparse.c
index 5943467..6be9f16 100644
--- a/lib-crypt/gnupgparse.c
+++ b/lib-crypt/gnupgparse.c
@@ -24,7 +24,6 @@
 #include <lib-sys/unix.h>
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
 
@@ -274,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);
@@ -311,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);