lib: strip trailing '/' from pathnames (sexp queries).

[notmuch] / notmuch-config.c

diff --git a/notmuch-config.c b/notmuch-config.c
index 80a207f69d9744a04b5edb992b05a79c7c3813d5..e9456d794456c080e81abbd6a00efcb6b123c3c4 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -383,7 +383,10 @@ _config_set_list (notmuch_conffile_t *config,
                  const char *list[],
                  size_t length)
 {
-    g_key_file_set_string_list (config->key_file, group, key, list, length);
+    if (length > 1)
+       g_key_file_set_string_list (config->key_file, group, key, list, length);
+    else
+       g_key_file_set_string (config->key_file, group, key, list[0]);
 }
 
 void
@@ -517,6 +520,7 @@ static const struct config_key
     { "index.decrypt",   false,  NULL },
     { "index.header.",   true,   validate_field_name },
     { "query.",          true,   NULL },
+    { "squery.",         true,   validate_field_name },
 };
 
 static const config_key_info_t *
@@ -679,6 +683,9 @@ _notmuch_config_list_built_with ()
     printf ("%sretry_lock=%s\n",
            BUILT_WITH_PREFIX,
            notmuch_built_with ("retry_lock") ? "true" : "false");
+    printf ("%ssexp_queries=%s\n",
+           BUILT_WITH_PREFIX,
+           notmuch_built_with ("sexp_queries") ? "true" : "false");
 }
 
 static int