move rfc2047.c into lib-mime, reindent it.

[apps/madmutt.git] / gnupgparse.c

diff --git a/gnupgparse.c b/gnupgparse.c
index b9f00ba..cdce751 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -204,7 +204,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         debug_print (2, ("key id: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
         debug_print (2, ("key id: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))

-          str_replace (&k->keyid, p);
+          m_strreplace(&k->keyid, p);

         break;
 
       }
         break;
 
       }


@@ -310,7 +310,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 

-  str_replace (&_chs, Charset);
+  m_strreplace(&_chs, Charset);

 
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
                                  keyring, hints);
 
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
                                  keyring, hints);