X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=a2fad56f630db50682b656432064e87a0059552d;hp=54899d85b667f6c28def0c8dc96e0ccb267487de;hb=c5ca8b7eaa727392811813926cda758bceef80f1;hpb=5e6273c09929249ee7a850934bf12fd03439d923

diff --git a/main.c b/main.c
index 54899d8..a2fad56 100644
--- a/main.c
+++ b/main.c
@@ -631,7 +631,7 @@ int main (int argc, char **argv)
       break;
 
     case 'F':
-      str_replace (&Muttrc, optarg);
+      m_strreplace(&Muttrc, optarg);
       break;
 
     case 'f':
@@ -788,7 +788,7 @@ int main (int argc, char **argv)
 
   if (alias_queries) {
     int rv = 0;
-    ADDRESS *a;
+    address_t *a;
 
     for (; alias_queries; alias_queries = alias_queries->next) {
       if ((a = mutt_lookup_alias (alias_queries->data))) {
@@ -1008,8 +1008,8 @@ int main (int argc, char **argv)
 #endif
       mutt_expand_path (folder, sizeof (folder));
 
-    str_replace (&CurrentFolder, folder);
-    str_replace (&LastFolder, folder);
+    m_strreplace(&CurrentFolder, folder);
+    m_strreplace(&LastFolder, folder);
 
     if (flags & M_IGNORE) {
       /* check to see if there are any messages in the folder */