From e76f6517de020783d828be59f461f1d4f465c4b4 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 3 Mar 2013 23:55:08 +0200 Subject: cli: config: make notmuch_config_open() "is new" parameter input only We now have a notmuch_config_is_new() function to query whether a config was created or not. Change the notmuch_config_open() is_new parameter into boolean create_new to determine whether the function should create a new config if one doesn't exist. This reduces the complexity of the API. --- notmuch-setup.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'notmuch-setup.c') diff --git a/notmuch-setup.c b/notmuch-setup.c index 94d0aa7b..72d862ab 100644 --- a/notmuch-setup.c +++ b/notmuch-setup.c @@ -130,7 +130,6 @@ notmuch_setup_command (unused (void *ctx), 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; @@ -147,9 +146,9 @@ notmuch_setup_command (unused (void *ctx), 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)); @@ -229,7 +228,7 @@ notmuch_setup_command (unused (void *ctx), if (! notmuch_config_save (config)) { - if (is_new) + if (notmuch_config_is_new (config)) welcome_message_post_setup (); return 0; } else { -- cgit v1.2.3