"database",
" Database configuration\n"
"\n"
- " The only value supported here is 'path' which should be the top-level\n"
- " directory where your mail currently exists and to where mail will be\n"
- " delivered in the future. Files should be individual email messages.\n"
- " Notmuch will store its database within a sub-directory of the path\n"
- " configured here named \".notmuch\".\n"
+ " Supported values are 'mail_root' and 'path'. The recommended option\n"
+ " is to set 'mail_root' to the directory where your mail currently exists\n"
+ " and to where mail will be delivered in the future. Files should be\n"
+ " individual email messages. By default notmuch will store its database\n"
+ " in $XDG_DATA_HOME/notmuch; you can override this by setting 'path'.\n"
+ " If only 'path' is set, this directory is for 'mail_root' and for\n"
+ " the database location (in a subdirectory called \".notmuch\").\n"
},
{
"user",
return NULL;
}
- if (config->is_new)
- g_key_file_set_comment (config->key_file, NULL, NULL,
- toplevel_config_comment, NULL);
-
for (size_t i = 0; i < ARRAY_SIZE (group_comment_table); i++) {
const char *name = group_comment_table[i].group_name;
if (! g_key_file_has_group (config->key_file, name)) {
/* Force group to exist before adding comment */
g_key_file_set_value (config->key_file, name, "dummy_key", "dummy_val");
g_key_file_remove_key (config->key_file, name, "dummy_key", NULL);
- g_key_file_set_comment (config->key_file, name, NULL,
- group_comment_table[i].comment, NULL);
+ if (config->is_new && (i == 0) ) {
+ const char *comment;
+
+ comment = talloc_asprintf (config, "%s\n%s",
+ toplevel_config_comment,
+ group_comment_table[i].comment);
+ g_key_file_set_comment (config->key_file, name, NULL, comment,
+ NULL);
+ } else {
+ g_key_file_set_comment (config->key_file, name, NULL,
+ group_comment_table[i].comment, NULL);
+ }
}
}
return config;
const char *list[],
size_t length)
{
- g_key_file_set_string_list (config->key_file, group, key, list, length);
+ if (length > 1)
+ g_key_file_set_string_list (config->key_file, group, key, list, length);
+ else
+ g_key_file_set_string (config->key_file, group, key, list[0]);
}
void
printf ("%sretry_lock=%s\n",
BUILT_WITH_PREFIX,
notmuch_built_with ("retry_lock") ? "true" : "false");
- printf ("%ssexpr_query=%s\n",
+ printf ("%ssexp_queries=%s\n",
BUILT_WITH_PREFIX,
- notmuch_built_with ("sexpr_query") ? "true" : "false");
+ notmuch_built_with ("sexp_queries") ? "true" : "false");
}
static int