notmuch_config_t *
notmuch_config_open (void *ctx,
const char *filename,
- notmuch_bool_t *is_new_ret);
+ notmuch_bool_t create_new);
void
notmuch_config_close (notmuch_config_t *config);
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");
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;
-
- config->is_new = is_new;
-
return config;
}
{
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;
return 1;
}
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
notmuch_tags_t *tags;
const char *query_str = "";
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
return 1;
}
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
notmuch_exit_if_unsupported_format ();
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
int opt_index;
int input_format = DUMP_FORMAT_AUTO;
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
notmuch_exit_if_unsupported_format ();
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
size_t old_other_emails_len;
GPtrArray *other_emails;
unsigned int i;
- int is_new;
const char **new_tags;
size_t new_tags_len;
const char **search_exclude_tags;
chomp_newline (response); \
} while (0)
- config = notmuch_config_open (ctx, NULL, &is_new);
+ config = notmuch_config_open (ctx, NULL, TRUE);
- if (is_new)
+ if (notmuch_config_is_new (config))
welcome_message_pre_setup ();
prompt ("Your full name [%s]: ", notmuch_config_get_user_name (config));
if (! notmuch_config_save (config)) {
- if (is_new)
+ if (notmuch_config_is_new (config))
welcome_message_post_setup ();
return 0;
} else {
else
params.entire_thread = FALSE;
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
return 1;
}
- config = notmuch_config_open (ctx, NULL, NULL);
+ config = notmuch_config_open (ctx, NULL, FALSE);
if (config == NULL)
return 1;
notmuch_command (void *ctx, unused(int argc), unused(char *argv[]))
{
notmuch_config_t *config;
- notmuch_bool_t is_new;
char *db_path;
struct stat st;
- config = notmuch_config_open (ctx, NULL, &is_new);
+ config = notmuch_config_open (ctx, NULL, TRUE);
/* If the user has never configured notmuch, then run
* notmuch_setup_command which will give a nice welcome message,
* and interactively guide the user through the configuration. */
- if (is_new) {
+ if (notmuch_config_is_new (config)) {
notmuch_config_close (config);
return notmuch_setup_command (ctx, 0, NULL);
}
exit (1);
}
- config = notmuch_config_open (ctx, config_path, NULL);
+ config = notmuch_config_open (ctx, config_path, FALSE);
if (config == NULL)
return 1;