CLI: generalize notmuch_config_mode_t

[notmuch] / notmuch-config.c

diff --git a/notmuch-config.c b/notmuch-config.c
index 1b079e857d030e894dd4daed5fa5b306b9e1e2b6..cefb827478b64c41a2f37a68841adf2037e37c01 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -119,7 +119,6 @@ struct _notmuch_config {
     bool is_new;
 
     char *database_path;
-    char *crypto_gpg_path;
     char *user_name;
     char *user_primary_email;
     const char **user_other_email;
@@ -325,7 +324,7 @@ get_config_from_file (notmuch_config_t *config, bool create_new)
 notmuch_config_t *
 notmuch_config_open (void *ctx,
                     const char *filename,
-                    notmuch_config_mode_t config_mode)
+                    notmuch_command_mode_t config_mode)
 {
     GError *error = NULL;
     size_t tmp;
@@ -360,8 +359,8 @@ notmuch_config_open (void *ctx,
 
     config->key_file = g_key_file_new ();
 
-    if (config_mode & NOTMUCH_CONFIG_OPEN) {
-       bool create_new = (config_mode & NOTMUCH_CONFIG_CREATE) != 0;
+    if (config_mode & NOTMUCH_COMMAND_CONFIG_OPEN) {
+       bool create_new = (config_mode & NOTMUCH_COMMAND_CONFIG_CREATE) != 0;
 
        if (! get_config_from_file (config, create_new)) {
            talloc_free (config);