X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgpkey.c;h=b31676a5ec5985c42f911f36f4929670c25c2f19;hp=a14ec778ffbb99ee6729a752f8090bd8c0210555;hb=2891636277fb96f992eaf08b4e6acc11ca9ea57c;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/pgpkey.c b/pgpkey.c
index a14ec77..b31676a 100644
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -40,8 +40,6 @@
 
 #include <locale.h>
 
-#ifdef CRYPT_BACKEND_CLASSIC_PGP
-
 struct pgp_cache {
   char *what;
   char *dflt;
@@ -662,7 +660,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;
@@ -939,7 +937,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;
@@ -966,6 +964,3 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
   return NULL;
 }
 
-
-
-#endif /* CRYPT_BACKEND_CLASSIC_PGP */