From 82ab72c621e248ff10ae790ce7e64bbbbe165261 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Sun, 22 Apr 2012 14:07:54 +0200 Subject: [PATCH] [PATCH 4/7] Use notmuch_database_destroy instead of notmuch_database_close --- 0a/cb738ba520462c90688145019b014d90e1ca70 | 85 +++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 0a/cb738ba520462c90688145019b014d90e1ca70 diff --git a/0a/cb738ba520462c90688145019b014d90e1ca70 b/0a/cb738ba520462c90688145019b014d90e1ca70 new file mode 100644 index 000000000..07560a842 --- /dev/null +++ b/0a/cb738ba520462c90688145019b014d90e1ca70 @@ -0,0 +1,85 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id CFD33431E64 + for ; Sun, 22 Apr 2012 05:08:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 9+8AXpaMABEi for ; + Sun, 22 Apr 2012 05:08:48 -0700 (PDT) +Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0D15D431FD0 + for ; Sun, 22 Apr 2012 05:08:48 -0700 (PDT) +Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mail.cryptobitch.de (Postfix) with ESMTPSA id 82EF75836F8 + for ; Sun, 22 Apr 2012 14:08:46 +0200 (CEST) +Received: by mail.jade-hamburg.de (Postfix, from userid 401) + id E4CABDF2A1; Sun, 22 Apr 2012 14:08:45 +0200 (CEST) +Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) (Authenticated sender: teythoon) + by mail.jade-hamburg.de (Postfix) with ESMTPSA id D4249DF2A3; + Sun, 22 Apr 2012 14:08:28 +0200 (CEST) +Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77) + (envelope-from ) + id 1SLvac-0007B0-VI; Sun, 22 Apr 2012 14:08:27 +0200 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +To: notmuch@notmuchmail.org +Subject: [PATCH 4/7] Use notmuch_database_destroy instead of + notmuch_database_close +Date: Sun, 22 Apr 2012 14:07:54 +0200 +Message-Id: + <1335096477-27537-4-git-send-email-4winter@informatik.uni-hamburg.de> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +References: <20120422120620.26225.40778@thinkbox.jade-hamburg.de> + <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 22 Apr 2012 12:08:49 -0000 + +Adapt notmuch-deliver to the notmuch_database_close split. + +Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de> +--- + contrib/notmuch-deliver/src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c +index 6f32f73..37d2919 100644 +--- a/contrib/notmuch-deliver/src/main.c ++++ b/contrib/notmuch-deliver/src/main.c +@@ -455,7 +455,7 @@ main(int argc, char **argv) + g_strfreev(opt_rtags); + g_free(mail); + +- notmuch_database_close(db); ++ notmuch_database_destroy(db); + + return 0; + } +-- +1.7.10 + -- 2.26.2