X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=options.c;h=ad0671161abf79e7da0f50fa23c3d1eb2b42c6ec;hb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;hp=6f73d788b1cbc79e8d51955dc5b83c1a1cc2db85;hpb=12a57d9405d7910566d5ff888d743d29b0716554;p=pkg%2Fabook.git diff --git a/options.c b/options.c index 6f73d78..ad06711 100644 --- a/options.c +++ b/options.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -10,7 +10,6 @@ #include #include #include -#include #include "abook_curses.h" #include "abook.h" #include "options.h" @@ -81,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() { @@ -124,6 +122,7 @@ load_options() } } +#if 1 void save_options() { @@ -132,6 +131,7 @@ save_options() conff_save_file(abook_config, rcfile); } +#endif static void options_add_key(char *key, char *value) @@ -148,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"); @@ -162,4 +162,6 @@ default_options() options_add_key("www_command", "lynx"); options_add_key("address_style", "eu"); + + options_add_key("use_ascii_only", "false"); }