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

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index bca29d0..32efdb7 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -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;
@@ -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);
 }