From ca3a4fc02287f65c3587908012d36e68df0200b1 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 3 Mar 2013 23:55:07 +0200 Subject: [PATCH] cli: config: keep track of whether the config is newly created Keep track of whether the config is newly created, and add notmuch_config_is_new() accessor function to query this. This is to support anyone with a config handle to check this, instead of just whoever called notmuch_config_open(). --- notmuch-client.h | 3 +++ notmuch-config.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/notmuch-client.h b/notmuch-client.h index 5f288368..07367e01 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -256,6 +256,9 @@ notmuch_config_close (notmuch_config_t *config); int notmuch_config_save (notmuch_config_t *config); +notmuch_bool_t +notmuch_config_is_new (notmuch_config_t *config); + const char * notmuch_config_get_database_path (notmuch_config_t *config); diff --git a/notmuch-config.c b/notmuch-config.c index b5c2066e..e733e929 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -104,6 +104,7 @@ static const char search_config_comment[] = struct _notmuch_config { char *filename; GKeyFile *key_file; + notmuch_bool_t is_new; char *database_path; char *user_name; @@ -266,6 +267,7 @@ notmuch_config_open (void *ctx, config->key_file = g_key_file_new (); + config->is_new = FALSE; config->database_path = NULL; config->user_name = NULL; config->user_primary_email = NULL; @@ -435,6 +437,8 @@ notmuch_config_open (void *ctx, if (is_new_ret) *is_new_ret = is_new; + config->is_new = is_new; + return config; } @@ -482,6 +486,13 @@ notmuch_config_save (notmuch_config_t *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, -- 2.26.2