X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=options.c;h=ad0671161abf79e7da0f50fa23c3d1eb2b42c6ec;hb=e8627e2a5127283fb5930c942dbf921d3f8b73fc;hp=31d5eaaa9bdd33f00976297dacfeca90b12a582f;hpb=8c3f50479d2b84db00ed9b8305ca92a5b56ba32e;p=pkg%2Fabook.git

diff --git a/options.c b/options.c
index 31d5eaa..ad06711 100644
--- a/options.c
+++ b/options.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -80,10 +80,18 @@ init_options()
 		default_options();
 }
 
+
+#if 1
+extern bool alternative_rcfile;
+#endif
+
 void
 close_config()
 {
-	save_options();
+#if 1
+	if(!alternative_rcfile)
+		save_options();
+#endif
 
 	conff_free_nodes(abook_config);
 }
@@ -114,6 +122,7 @@ load_options()
 	}
 }
 
+#if 1
 void
 save_options()
 {
@@ -122,6 +131,7 @@ save_options()
 
 	conff_save_file(abook_config, rcfile);
 }
+#endif
 
 static void
 options_add_key(char *key, char *value)
@@ -138,7 +148,7 @@ default_options()
 
 	options_add_key("show_all_emails", "true");
 	options_add_key("emailpos", "25");
-	options_add_key("extra_column", "7");
+	options_add_key("extra_column", "phone");
 	options_add_key("extra_alternative", "-1");
 	options_add_key("extrapos", "65");
 
@@ -153,5 +163,5 @@ default_options()
 
 	options_add_key("address_style", "eu");
 
-	options_add_key("use_ascii_only", "true");
+	options_add_key("use_ascii_only", "false");
 }