X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpkey.c;h=ecd789ee79f4e7b53f2ef672e85a2a3d5af984bf;hp=62d050e87054382d97862db1dfb28807f80f3593;hb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/pgpkey.c b/pgpkey.c
index 62d050e..ecd789e 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -662,7 +662,7 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
 
     if (whatfor) {
       if (l)
-        str_replace (&l->dflt, resp);
+        m_strreplace(&l->dflt, resp);
       else {
         l = p_new(struct pgp_cache, 1);
         l->next = id_defaults;
@@ -861,7 +861,7 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
           this_key_has_weak = 1;
       }
 
-      rfc822_free_address (&r);
+      address_delete (&r);
     }
 
     if (match && !this_key_has_strong && this_key_has_invalid)
@@ -939,7 +939,7 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
               && !m_strcasecmp(p + 2, pgp_keyid (k)))
           || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, k->keyid + 8))
-          || str_isstr (a->addr, p)) {
+          || m_stristr(a->addr, p)) {
         debug_print (5, ("match.\n"));
         match = 1;
         break;