X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fopen.cc;h=54510eace89b04a565a1b868af2d7f88d44f1e66;hp=4dd62a9f25caafc5baec4803ee883e8bca333018;hb=3eb25c94bd8fe4065d6df6d665ee393cb9a0ad6f;hpb=14c4f9441d7fe0893003a5e793e19f1e55c9f73f

diff --git a/lib/open.cc b/lib/open.cc
index 4dd62a9f..54510eac 100644
--- a/lib/open.cc
+++ b/lib/open.cc
@@ -19,9 +19,8 @@ notmuch_database_open (const char *path,
     char *status_string = NULL;
     notmuch_status_t status;
 
-    status = notmuch_database_open_verbose (path, mode, database,
-					    &status_string);
-
+    status = notmuch_database_open_with_config (path, mode, "", NULL,
+						database, &status_string);
     if (status_string) {
 	fputs (status_string, stderr);
 	free (status_string);
@@ -199,7 +198,7 @@ _choose_database_path (void *ctx,
     }
 
     if (! *database_path && key_file) {
-	char *path = g_key_file_get_value (key_file, "database", "path", NULL);
+	char *path = g_key_file_get_string (key_file, "database", "path", NULL);
 	if (path) {
 	    if (path[0] == '/')
 		*database_path = talloc_strdup (ctx, path);
@@ -643,7 +642,7 @@ notmuch_database_create_with_config (const char *database_path,
 
     if (key_file && ! split) {
 	char *mail_root = notmuch_canonicalize_file_name (
-	    g_key_file_get_value (key_file, "database", "mail_root", NULL));
+	    g_key_file_get_string (key_file, "database", "mail_root", NULL));
 	char *db_path = notmuch_canonicalize_file_name (database_path);
 
 	split = (mail_root && (0 != strcmp (mail_root, db_path)));