"\tignore A list (separated by ';') of file and directory names\n"
"\t that will not be searched for messages by \"notmuch new\".\n"
"\n"
- "\t NOTE: *Every* file/directory that goes by one of those names will\n"
- "\t be ignored, independent of its depth/location in the mail store.\n";
+ "\t NOTE: *Every* file/directory that goes by one of those\n"
+ "\t names will be ignored, independent of its depth/location\n"
+ "\t in the mail store.\n";
static const char user_config_comment[] =
" User configuration\n"
struct _notmuch_config {
char *filename;
GKeyFile *key_file;
+ notmuch_bool_t is_new;
char *database_path;
char *user_name;
notmuch_config_t *
notmuch_config_open (void *ctx,
const char *filename,
- notmuch_bool_t *is_new_ret)
+ notmuch_bool_t create_new)
{
GError *error = NULL;
- int is_new = 0;
size_t tmp;
char *notmuch_config_env = NULL;
int file_had_database_group;
int file_had_maildir_group;
int file_had_search_group;
- if (is_new_ret)
- *is_new_ret = 0;
-
notmuch_config_t *config = talloc (ctx, notmuch_config_t);
if (config == NULL) {
fprintf (stderr, "Out of memory.\n");
config->key_file = g_key_file_new ();
+ config->is_new = FALSE;
config->database_path = NULL;
config->user_name = NULL;
config->user_primary_email = NULL;
G_KEY_FILE_KEEP_COMMENTS,
&error))
{
- /* If the caller passed a non-NULL value for is_new_ret, then
- * the caller is prepared for a default configuration file in
- * the case of FILE NOT FOUND. Otherwise, any read failure is
- * an error.
+ /* If create_new is true, then the caller is prepared for a
+ * default configuration file in the case of FILE NOT
+ * FOUND. Otherwise, any read failure is an error.
*/
- if (is_new_ret &&
+ if (create_new &&
error->domain == G_FILE_ERROR &&
error->code == G_FILE_ERROR_NOENT)
{
g_error_free (error);
- is_new = 1;
+ config->is_new = TRUE;
}
else
{
}
if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) {
- if (is_new) {
+ if (config->is_new) {
const char *tags[] = { "deleted", "spam" };
notmuch_config_set_search_exclude_tags (config, tags, 2);
} else {
/* Whenever we know of configuration sections that don't appear in
* the configuration file, we add some comments to help the user
* understand what can be done. */
- if (is_new)
+ if (config->is_new)
{
g_key_file_set_comment (config->key_file, NULL, NULL,
toplevel_config_comment, NULL);
search_config_comment, NULL);
}
- if (is_new_ret)
- *is_new_ret = is_new;
-
return config;
}
return 0;
}
+notmuch_bool_t
+notmuch_config_is_new (notmuch_config_t *config)
+{
+ return config->is_new;
+}
+
+
static const char **
_config_get_list (notmuch_config_t *config,
const char *section, const char *key,
{
notmuch_config_t *config;
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
if (_item_split (item, &group, &key))
return 1;
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
char **groups;
size_t g, groups_length;
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;