X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=crypt-gpgme.c;h=145a6e0f2d29c4602b68b1f8b93cacc549993200;hp=bca29d01b9a374ffb135ea004da059d8c2e42c03;hb=d5d56308b49c3f157a17125415312f0c13e1e25b;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index bca29d0..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"
@@ -3497,7 +3497,7 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities,
                    || !(validity & CRYPT_KV_ADDR)))
         this_key_has_weak = 1;
     }
-    rfc822_free_address (&r);
+    address_delete (&r);
 
     if (match) {
       crypt_key_t *tmp;
@@ -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;
@@ -3688,7 +3688,7 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
       abort ();
     }
 
-    *last = rfc822_cpy_adr (p);
+    *last = address_list_dup (p);
     while (*last)
       last = &((*last)->next);
   }
@@ -3730,8 +3730,8 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
       }
       else if (r == -1) {
         p_delete(&keylist);
-        rfc822_free_address (&tmp);
-        rfc822_free_address (&addr);
+        address_delete (&tmp);
+        address_delete (&addr);
         return NULL;
       }
     }
@@ -3749,8 +3749,8 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
 #endif
                                     &forced_valid)) == NULL) {
         p_delete(&keylist);
-        rfc822_free_address (&tmp);
-        rfc822_free_address (&addr);
+        address_delete (&tmp);
+        address_delete (&addr);
         return NULL;
       }
     }
@@ -3775,9 +3775,9 @@ static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
     keylist_used = m_strlen(keylist);
 
     crypt_free_key (&key);
-    rfc822_free_address (&addr);
+    address_delete (&addr);
   }
-  rfc822_free_address (&tmp);
+  address_delete (&tmp);
   return (keylist);
 }
 
@@ -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);