Removed newlines from error strings.

[gedcom-parse.git] / gedcom / compat.c

diff --git a/gedcom/compat.c b/gedcom/compat.c
index 6ac021f2077b01858614284e55f3b29ac246e580..d4fdb9f480216801f155de5264a8513cefa75dfc 100644 (file)
--- a/gedcom/compat.c
+++ b/gedcom/compat.c
@@ -31,7 +31,7 @@
 int compat_enabled = 1;
 int compatibility  = 0; 
 int compat_at = 0;
-char* default_charset;
+char* default_charset = "";
 
 #define SUBMITTER_LINK         "@__COMPAT__SUBM__@"
 #define DEFAULT_SUBMITTER_NAME "Submitter"
@@ -63,11 +63,15 @@ void gedcom_set_compat_handling(int enable_compat)
 
 void set_compatibility(char* program)
 {
+  /* Reinitialize compatibility */
+  compat_at = 0;
+  default_charset = "";
+  compatibility = 0;
+  
   if (compat_enabled) {
     if (! strncmp(program, "ftree", 6)) {
       gedcom_warning(_("Enabling compatibility with 'ftree'"));
       compatibility = C_FTREE;
-      default_charset = "ANSI";
     }
     else if (! strncmp(program, "LIFELINES", 9)) {
       /* Matches "LIFELINES 3.0.2" */
@@ -76,9 +80,6 @@ void set_compatibility(char* program)
       default_charset = "ANSI";
       compat_at = 1;
     }
-    else {
-      compatibility = 0;
-    }
   }
 }