Simplify charset.cpkg a bit

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

diff --git a/lib-crypt/gnupgparse.c b/lib-crypt/gnupgparse.c
index d4876d6..6be9f16 100644 (file)
--- a/lib-crypt/gnupgparse.c
+++ b/lib-crypt/gnupgparse.c
@@ -273,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);
@@ -310,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);