--- psiconv/trunk/lib/psiconv/error.c	2003/11/26 20:56:43	172
+++ psiconv/trunk/lib/psiconv/error.c	2003/11/27 11:43:51	173
@@ -37,9 +37,6 @@
   fprintf(stderr,"%s\n",message);
 }
 
-psiconv_error_handler_t psiconv_error_handler = psiconv_default_error_handler;
-
-
 #define MAX_MESSAGE 160
 
 void psiconv_fatal(psiconv_config config, int level, psiconv_u32 off,
@@ -54,7 +51,10 @@
   curlen = strlen(buffer);
 
   vsnprintf(buffer+curlen,MAX_MESSAGE-curlen,format,ap);
-  psiconv_error_handler(PSICONV_VERB_FATAL,off,buffer);
+  if (config->error_handler) 
+    config->error_handler(PSICONV_VERB_FATAL,off,buffer);
+  else
+    psiconv_default_error_handler(PSICONV_VERB_FATAL,off,buffer);
   va_end(ap);
 
   exit(1);
@@ -74,7 +74,10 @@
     curlen = strlen(buffer);
 
     vsnprintf(buffer+curlen,MAX_MESSAGE-curlen,format,ap);
-    psiconv_error_handler(PSICONV_VERB_WARN,off,buffer);
+    if (config->error_handler) 
+      config->error_handler(PSICONV_VERB_WARN,off,buffer);
+    else
+      psiconv_default_error_handler(PSICONV_VERB_WARN,off,buffer);
   }
   va_end(ap);
 }
@@ -103,7 +106,10 @@
 
     vsnprintf(buffer+curlen,MAX_MESSAGE-curlen,format,ap);
 
-    psiconv_error_handler(PSICONV_VERB_PROGRESS,off,buffer);
+    if (config->error_handler)
+      config->error_handler(PSICONV_VERB_PROGRESS,off,buffer);
+    else
+      psiconv_default_error_handler(PSICONV_VERB_PROGRESS,off,buffer);
   }
 
   va_end(ap);
@@ -134,7 +140,10 @@
 
     vsnprintf(buffer+curlen,MAX_MESSAGE-curlen,format,ap);
 
-    psiconv_error_handler(PSICONV_VERB_DEBUG,off,buffer);
+    if (config->error_handler)
+      config->error_handler(PSICONV_VERB_DEBUG,off,buffer);
+    else
+      psiconv_default_error_handler(PSICONV_VERB_DEBUG,off,buffer);
   }
   va_end(ap);
 }