X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-gpgme.c;h=145a6e0f2d29c4602b68b1f8b93cacc549993200;hp=32efdb7763576a7d4ca9604bbcc6de7a874eca0a;hb=f7f0722b06934cf83c08e60d805238478ada2699;hpb=33d07d4040a973a004c4a729fd1f56a63a7203e6

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 32efdb7..145a6e0 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -27,7 +27,7 @@
 #include <lib-mime/mime.h>
 
 #include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "handler.h"
@@ -3576,7 +3576,7 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
         || (option (OPTPGPLONGIDS)
             && !m_strncasecmp(p, "0x", 2)
             && !m_strcasecmp(p + 2, crypt_keyid (k) + 8))
-        || str_isstr (k->uid, p)) {
+        || m_stristr(k->uid, p)) {
       crypt_key_t *tmp;
 
       debug_print (5, ("match.\n"));
@@ -3636,7 +3636,7 @@ static crypt_key_t *crypt_ask_for_key (char *tag,
 
     if (whatfor) {
       if (l)
-        str_replace (&l->dflt, resp);
+        m_strreplace(&l->dflt, resp);
       else {
         l = p_new(struct crypt_cache, 1);
         l->next = id_defaults;
@@ -3854,7 +3854,7 @@ static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
                                 is_smime ? APPLICATION_SMIME :
                                 APPLICATION_PGP, NULL))) {
       snprintf (input_signas, sizeof (input_signas), "0x%s", crypt_keyid (p));
-      str_replace (is_smime ? &SmimeDefaultKey : &PgpSignAs,
+      m_strreplace(is_smime ? &SmimeDefaultKey : &PgpSignAs,
                         input_signas);
       crypt_free_key (&p);