X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=smime.c;h=3db7185a2b2690d4c21f75bd56f4213270dfa91e;hp=0c9d435b3bc9e810472782fcd618abb04b862798;hb=df5b14084b39821395408679a2fb6f74605182ce;hpb=cfc49a0d8c3ac2c0bd4b217026d0740c55f2e5db

diff --git a/smime.c b/smime.c
index 0c9d435..3db7185 100644
--- a/smime.c
+++ b/smime.c
@@ -756,7 +756,7 @@ char *smime_findKeys (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);
   }
@@ -1906,10 +1906,10 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: DES, 2: Triple-DES "),
                                                 _("dt"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "des");
+                m_strreplace(&SmimeCryptAlg, "des");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "des3");
+                m_strreplace(&SmimeCryptAlg, "des3");
                 break;
             }
             break;
@@ -1918,13 +1918,13 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: RC2-40, 2: RC2-64, 3: RC2-128 "),
                                                 _("468"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "rc2-40");
+                m_strreplace(&SmimeCryptAlg, "rc2-40");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "rc2-64");
+                m_strreplace(&SmimeCryptAlg, "rc2-64");
                 break;
               case 3:
-                str_replace (&SmimeCryptAlg, "rc2-128");
+                m_strreplace(&SmimeCryptAlg, "rc2-128");
                 break;
             }
             break;
@@ -1933,13 +1933,13 @@ int smime_send_menu (HEADER * msg, int *redraw)
             switch (choice = mutt_multi_choice (_("1: AES128, 2: AES192, 3: AES256 "),
                                                 _("895"))) {
               case 1:
-                str_replace (&SmimeCryptAlg, "aes128");
+                m_strreplace(&SmimeCryptAlg, "aes128");
                 break;
               case 2:
-                str_replace (&SmimeCryptAlg, "aes192");
+                m_strreplace(&SmimeCryptAlg, "aes192");
                 break;
               case 3:
-                str_replace (&SmimeCryptAlg, "aes256");
+                m_strreplace(&SmimeCryptAlg, "aes256");
                 break;
             }
             break;
@@ -1969,7 +1969,7 @@ int smime_send_menu (HEADER * msg, int *redraw)
   case 4:                      /* sign (a)s */
 
     if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0))) {
-      str_replace (&SmimeDefaultKey, p);
+      m_strreplace(&SmimeDefaultKey, p);
 
       msg->security |= SIGN;