Use notmuch_database_destroy instead of notmuch_database_close

Adapt the notmuch binaries source to the notmuch_database_close split.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>

diff --git a/notmuch-count.c b/notmuch-count.c
index b76690c0d5eb776096c481f2aff6d9fd62a3e728..9c2ad7b2a9226bb8ee616779d88cde69171ac704 100644 (file)
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -107,7 +107,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
     }
 
     notmuch_query_destroy (query);
     }
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     return 0;
 }
 
     return 0;
 }

diff --git a/notmuch-dump.c b/notmuch-dump.c
index a73587562fb9ce929e78807ec46fc8a97e5df087..71ab0ea73d69f44de2505099c86f605e0d3cb33e 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -116,7 +116,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
        fclose (output);
 
     notmuch_query_destroy (query);
        fclose (output);
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     return 0;
 }
 
     return 0;
 }

diff --git a/notmuch-new.c b/notmuch-new.c
index 473201e961cdb61fe51c1807a18b4161d3615f48..3ff630478c613848f342ddbdb42fa625484254d0 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -1041,7 +1041,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
        fprintf (stderr, "Note: A fatal error was encountered: %s\n",
                 notmuch_status_to_string (ret));
 
        fprintf (stderr, "Note: A fatal error was encountered: %s\n",
                 notmuch_status_to_string (ret));
 

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     if (run_hooks && !ret && !interrupted)
        ret = notmuch_run_hook (db_path, "post-new");
 
     if (run_hooks && !ret && !interrupted)
        ret = notmuch_run_hook (db_path, "post-new");

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 0949d9fdc23eb5517695a10c352eabce9a66bf7b..da99a1374688befd36a859807862a25d7043a825 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -755,7 +755,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        return 1;
 
     notmuch_query_destroy (query);
        return 1;
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);
 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);

diff --git a/notmuch-restore.c b/notmuch-restore.c
index d3b9246237c54ee2561eecf4cba24499d2577d4e..02b563caae2dcbd5d52d223cf3ef6db4c2739d88 100644 (file)
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -192,7 +192,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
     if (line)
        free (line);
 
     if (line)
        free (line);
 

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

     if (input != stdin)
        fclose (input);
 
     if (input != stdin)
        fclose (input);
 

diff --git a/notmuch-search.c b/notmuch-search.c
index 1cc843075ec53b9d2ac0e973448c85422121adde..7dfd270e2019c651d6738a04e2cca7766a92bff7 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -545,7 +545,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     }
 
     notmuch_query_destroy (query);
     }
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     return ret;
 }
 
     return ret;
 }

diff --git a/notmuch-show.c b/notmuch-show.c
index da4a797fbf1e9ed7901301a7c1cb0f3895c3d16e..3b6667c4bdbd5d411fc35dabbe40bce8bc74d19b 100644 (file)
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1117,7 +1117,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
     }
 
     notmuch_query_destroy (query);
     }
 
     notmuch_query_destroy (query);

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);
 
     if (params.cryptoctx)
        g_object_unref(params.cryptoctx);

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 05feed3e97a461f7201ca0b2d0664cc5e3743586..bd56fd14a4699b74f5567f6ac0e3d4284a49600e 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -238,7 +238,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
 
     ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags);
 
 
     ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags);
 

-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);

 
     return ret;
 }
 
     return ret;
 }