Revert "ruby: Add workarounds to use in-tree build not the installed one"

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 1cc843075ec53b9d2ac0e973448c85422121adde..3be296d8a3f67db106d139c882544f3746eb4d8d 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -486,9 +486,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     if (config == NULL)
        return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
-                                    NOTMUCH_DATABASE_MODE_READ_ONLY);
-    if (notmuch == NULL)
+    if (notmuch_database_open (notmuch_config_get_database_path (config),
+                              NOTMUCH_DATABASE_MODE_READ_ONLY, &notmuch))
        return 1;
 
     query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);
@@ -545,7 +544,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     }
 
     notmuch_query_destroy (query);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return ret;
 }