1 files changed, 8 insertions, 9 deletions

diff --git a/modules/mailutils/mailutils.c b/modules/mailutils/mailutils.c
index 26d04d6..b383bdb 100644
--- a/modules/mailutils/mailutils.c
+++ b/modules/mailutils/mailutils.c
@@ -573,9 +573,8 @@ create_log_stream (mu_stream_t *pstream)
 static void
 init_hints(struct mu_cfg_parse_hints *hints)
 {
-        hints->flags |= MU_PARSE_CONFIG_PLAIN | 
-                        MU_CFG_PARSE_SITE_RCFILE | MU_CFG_PARSE_PROGRAM;
-        hints->site_rcfile = mu_site_config_file();
+        hints->flags |= MU_CFHINT_SITE_FILE | MU_CFHINT_PROGRAM;
+        hints->site_file = mu_site_config_file();
         hints->program = (char*) mu_program_name;
 }
 
@@ -595,9 +594,9 @@ mod_mailutils_init(int argc, char **argv)
                 { SMAP_OPTSTR(onerror-reply), smap_opt_string,
                   &dfl_onerror_reply },
                 { SMAP_OPTSTR(config-verbose), smap_opt_bitmask,
-                  &hints.flags, { MU_PARSE_CONFIG_VERBOSE } },
+                  &hints.flags, { MU_CF_VERBOSE } },
                 { SMAP_OPTSTR(config-dump), smap_opt_bitmask,
-                  &hints.flags, { MU_PARSE_CONFIG_DUMP } },
+                  &hints.flags, { MU_CF_DUMP } },
                 { NULL }
         };
 
@@ -660,9 +659,9 @@ mod_mailutils_init_db(const char *dbid, int argc, char **argv)
                 { SMAP_OPTSTR(config-file), smap_opt_string,
                   &config_file },
                 { SMAP_OPTSTR(config-verbose), smap_opt_bitmask,
-                  &cfgflags, { MU_PARSE_CONFIG_VERBOSE } },
+                  &cfgflags, { MU_CF_VERBOSE } },
                 { SMAP_OPTSTR(config-dump), smap_opt_bitmask,
-                  &cfgflags, { MU_PARSE_CONFIG_DUMP } },
+                  &cfgflags, { MU_CF_DUMP } },
                 { NULL }
         };
 
@@ -715,9 +714,9 @@ mod_mailutils_open(smap_database_t dbp)
 
                 mu_cfg_error_count = 0;
                 mu_cfg_parser_verbose = 0;
-                if (db->config_flags & MU_PARSE_CONFIG_VERBOSE)
+                if (db->config_flags & MU_CF_VERBOSE)
                         mu_cfg_parser_verbose++;
-                if (db->config_flags & MU_PARSE_CONFIG_DUMP)
+                if (db->config_flags & MU_CF_DUMP)
                         mu_cfg_parser_verbose++;
                 rc = mu_cfg_parse_file(&tree, db->config_file,
                                        db->config_flags);