diff options
| author |  Jani Nikula <jani@nikula.org> | 2013-03-03 23:55:08 +0200 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2013-03-07 09:39:12 -0400 |
| commit | e76f6517de020783d828be59f461f1d4f465c4b4 (patch) | |
| tree | 9bc07e087684487f14f05bcb8e88e30452f0d0d1 /notmuch-setup.c | |
| parent | ca3a4fc02287f65c3587908012d36e68df0200b1 (diff) | |
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.
Diffstat (limited to 'notmuch-setup.c')
| -rw-r--r-- | notmuch-setup.c | 7 |
1 files changed, 3 insertions, 4 deletions
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 { |