7 -> phone in rcfile

[pkg/abook.git] / options.c

diff --git a/options.c b/options.c
index 477606755078c82c40fbfa586dd10e9574e81710..ad0671161abf79e7da0f50fa23c3d1eb2b42c6ec 100644 (file)
--- 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,23 +80,22 @@ 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);
 }
 
-void
-edit_options()
-{
-       /*
-        * not yet implemented
-        * edit your ~/.abook.conf manually
-        */
-}
-
 static int
 rcfile_exist()
 {
@@ -123,6 +122,7 @@ load_options()
        }
 }
 
+#if 1
 void
 save_options()
 {
@@ -131,6 +131,7 @@ save_options()
 
        conff_save_file(abook_config, rcfile);
 }
+#endif
 
 static void
 options_add_key(char *key, char *value)
@@ -147,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");
 
@@ -161,4 +162,6 @@ default_options()
        options_add_key("www_command", "lynx");
 
        options_add_key("address_style", "eu");
+
+       options_add_key("use_ascii_only", "false");
 }