[PATCH 3/7] Use notmuch_database_destroy instead of notmuch_database_close

diff --git a/48/bc58be0a72c96a736b897813425c2f338401c5 b/48/bc58be0a72c96a736b897813425c2f338401c5
new file mode 100644 (file)
index 0000000..3c1f5b4
--- /dev/null
+++ b/48/bc58be0a72c96a736b897813425c2f338401c5
@@ -0,0 +1,183 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 38B86429E30\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Mar 2012 17:55:43 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id qIkXTdOTJ3zz for <notmuch@notmuchmail.org>;\r
+       Tue, 20 Mar 2012 17:55:40 -0700 (PDT)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 016FA429E26\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Mar 2012 17:55:40 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (unknown [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 7D0FF57678C\r
+       for <notmuch@notmuchmail.org>; Wed, 21 Mar 2012 01:55:38 +0100 (CET)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id F17F6DF2A1; Wed, 21 Mar 2012 01:55:37 +0100 (CET)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id C4C43DF2A3;\r
+       Wed, 21 Mar 2012 01:55:26 +0100 (CET)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1SA9pk-0007vD-Uj; Wed, 21 Mar 2012 01:55:24 +0100\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/7] Use notmuch_database_destroy instead of\r
+       notmuch_database_close\r
+Date: Wed, 21 Mar 2012 01:55:07 +0100\r
+Message-Id:\r
+ <1332291311-28954-4-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To:\r
+ <1332291311-28954-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References:\r
+ <1332291311-28954-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 21 Mar 2012 00:55:43 -0000\r
+\r
+Adapt the notmuch binaries source to the notmuch_database_close split.\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ notmuch-count.c   |    2 +-\r
+ notmuch-dump.c    |    2 +-\r
+ notmuch-new.c     |    2 +-\r
+ notmuch-reply.c   |    2 +-\r
+ notmuch-restore.c |    2 +-\r
+ notmuch-search.c  |    2 +-\r
+ notmuch-show.c    |    2 +-\r
+ notmuch-tag.c     |    2 +-\r
+ 8 files changed, 8 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-count.c b/notmuch-count.c\r
+index 46b76ae..ade9138 100644\r
+--- a/notmuch-count.c\r
++++ b/notmuch-count.c\r
+@@ -100,7 +100,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[])\r
+     }\r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     return 0;\r
+ }\r
+diff --git a/notmuch-dump.c b/notmuch-dump.c\r
+index a735875..71ab0ea 100644\r
+--- a/notmuch-dump.c\r
++++ b/notmuch-dump.c\r
+@@ -116,7 +116,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])\r
+       fclose (output);\r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     return 0;\r
+ }\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 4f13535..f078753 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -1017,7 +1017,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+               notmuch_status_to_string (ret));\r
+     }\r
+ \r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     if (run_hooks && !ret && !interrupted)\r
+       ret = notmuch_run_hook (db_path, "post-new");\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index e2b6c25..1684b20 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -804,7 +804,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+       return 1;\r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     if (params.cryptoctx)\r
+       g_object_unref(params.cryptoctx);\r
+diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+index 87d9772..60efc52 100644\r
+--- a/notmuch-restore.c\r
++++ b/notmuch-restore.c\r
+@@ -184,7 +184,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])\r
+     if (line)\r
+       free (line);\r
+ \r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+     if (input != stdin)\r
+       fclose (input);\r
+ \r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index f6061e4..0b41573 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -531,7 +531,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+     }\r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     return ret;\r
+ }\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index ff9d427..c2eaa44 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -1119,7 +1119,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ \r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     if (params.cryptoctx)\r
+       g_object_unref(params.cryptoctx);\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 36b9b09..142005c 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -227,7 +227,7 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])\r
+     }\r
+ \r
+     notmuch_query_destroy (query);\r
+-    notmuch_database_close (notmuch);\r
++    notmuch_database_destroy (notmuch);\r
+ \r
+     return interrupted;\r
+ }\r
+-- \r
+1.7.9.1\r
+\r