X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgp.c;h=bb55885116d6b17eb999f3fa0c547cfc7e9b007e;hp=5c0d49797f0207109ccfeb67e1b604ab53ba0dd2;hb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23

diff --git a/lib-crypt/pgp.c b/lib-crypt/pgp.c
index 5c0d497..bb55885 100644
--- a/lib-crypt/pgp.c
+++ b/lib-crypt/pgp.c
@@ -187,7 +187,7 @@ static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset)
   char buf[HUGE_STRING];
   short complete, armor_header;
 
-  FGETCONV *fc;
+  fgetconv_t *fc;
 
   rewind (fpin);
 
@@ -414,7 +414,7 @@ int pgp_application_pgp_handler (BODY * m, STATE * s)
           pgp_copy_clearsigned (tmpfp, s, body_charset);
       }
       else if (pgpout) {
-        FGETCONV *fc;
+        fgetconv_t *fc;
 
         rewind (pgpout);
         state_set_prefix (s);
@@ -1348,9 +1348,9 @@ BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
   else
     from_charset = Charset;
 
-  if (!mutt_is_us_ascii (body_charset)) {
+  if (!charset_is_us_ascii (body_charset)) {
     int c;
-    FGETCONV *fc;
+    fgetconv_t *fc;
 
     if (flags & ENCRYPT)
       send_charset = "us-ascii";