Compatibility fixes for CVS MU.

2 files changed, 12 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ceb00a4..c221dfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-18  Sergey Poznyakoff  <gray@gnu.org.ua>
+
+	* src/main.c: Compatibility fixes for CVS MU.
+
 2007-11-20  Sergey Poznyakoff  <gray@gnu.org.ua>
 
 	* src/main.c: Define MU-1.3x configuration statements.
diff --git a/src/main.c b/src/main.c
index 1dab2ce..5dabde2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -205,12 +205,12 @@ static struct argp argp = {
 #if MAILUTILS_VERSION_NUMBER >= 1290
 
 static int
-_cb_verify_option (mu_cfg_locus_t *locus, void *data, char *arg, int bit)
+_cb_verify_option (mu_debug_t debug, void *data, char *arg, int bit)
 {
   int flag;
   if (mu_cfg_parse_boolean (arg, &flag))
     {
-      mu_error ("%s:%u: %s", locus->file, locus->line, _("not a boolean"));
+      mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("not a boolean"));
       return 1;
     }
   if (flag)
@@ -221,15 +221,15 @@ _cb_verify_option (mu_cfg_locus_t *locus, void *data, char *arg, int bit)
 }
 
 static int
-_cb_verify_po_time (mu_cfg_locus_t *locus, void *data, char *arg)
+_cb_verify_po_time (mu_debug_t debug, void *data, char *arg)
 {
-  return _cb_verify_option (locus, data, arg, VERIFY_PO_TIME);
+  return _cb_verify_option (debug, data, arg, VERIFY_PO_TIME);
 }
     
 static int
-_cb_verify_version (mu_cfg_locus_t *locus, void *data, char *arg)
+_cb_verify_version (mu_debug_t debug, void *data, char *arg)
 {
-  return _cb_verify_option (locus, data, arg, VERIFY_PACKAGE_VERSION);
+  return _cb_verify_option (debug, data, arg, VERIFY_PACKAGE_VERSION);
 }
     
 struct mu_cfg_param wyslij_po_cfg_param[] = {
@@ -241,8 +241,8 @@ struct mu_cfg_param wyslij_po_cfg_param[] = {
   { "fcc", mu_cfg_string, &fcc },
   { "from", mu_cfg_string, &sender },
   { "from-po", mu_cfg_bool, &set_sender_from_po },
-  { "verify-po-time", mu_cfg_callback, NULL, _cb_verify_po_time },
-  { "verify-version", mu_cfg_callback, NULL, _cb_verify_version },
+  { "verify-po-time", mu_cfg_callback, NULL, 0, _cb_verify_po_time },
+  { "verify-version", mu_cfg_callback, NULL, 0, _cb_verify_version },
   { NULL }
 };
 #endif