unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Justus Winter <4winter@informatik.uni-hamburg.de>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/7] Use notmuch_database_destroy instead of notmuch_database_close
Date: Sun, 22 Apr 2012 14:07:53 +0200	[thread overview]
Message-ID: <1335096477-27537-3-git-send-email-4winter@informatik.uni-hamburg.de> (raw)
In-Reply-To: <1335096477-27537-1-git-send-email-4winter@informatik.uni-hamburg.de>

Adapt the notmuch binaries source to the notmuch_database_close split.

Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
---
 notmuch-count.c   |    2 +-
 notmuch-dump.c    |    2 +-
 notmuch-new.c     |    2 +-
 notmuch-reply.c   |    2 +-
 notmuch-restore.c |    2 +-
 notmuch-search.c  |    2 +-
 notmuch-show.c    |    2 +-
 notmuch-tag.c     |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/notmuch-count.c b/notmuch-count.c
index b76690c..9c2ad7b 100644
--- 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_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return 0;
 }
diff --git a/notmuch-dump.c b/notmuch-dump.c
index a735875..71ab0ea 100644
--- 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);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return 0;
 }
diff --git a/notmuch-new.c b/notmuch-new.c
index 4f13535..f078753 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -1017,7 +1017,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 		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");
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 0949d9f..da99a13 100644
--- 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);
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     if (params.cryptoctx)
 	g_object_unref(params.cryptoctx);
diff --git a/notmuch-restore.c b/notmuch-restore.c
index d3b9246..02b563c 100644
--- 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);
 
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
     if (input != stdin)
 	fclose (input);
 
diff --git a/notmuch-search.c b/notmuch-search.c
index 1cc8430..7dfd270 100644
--- 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_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return ret;
 }
diff --git a/notmuch-show.c b/notmuch-show.c
index da4a797..3b6667c 100644
--- 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_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     if (params.cryptoctx)
 	g_object_unref(params.cryptoctx);
diff --git a/notmuch-tag.c b/notmuch-tag.c
index 05feed3..bd56fd1 100644
--- 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);
 
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return ret;
 }
-- 
1.7.10

  parent reply	other threads:[~2012-04-22 12:08 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-21  0:55 [RFC] Split notmuch_database_close into two functions Justus Winter
2012-03-21  0:55 ` [PATCH 1/7] " Justus Winter
2012-03-31 17:17   ` Mark Walters
2012-03-31 17:29     ` David Bremner
2012-04-16 21:51     ` Justus Winter
2012-04-17  8:37       ` Mark Walters
2012-03-21  0:55 ` [PATCH 2/7] NEWS: Document the notmuch_database_close split Justus Winter
2012-03-21  0:55 ` [PATCH 3/7] Use notmuch_database_destroy instead of notmuch_database_close Justus Winter
2012-03-21  0:55 ` [PATCH 4/7] " Justus Winter
2012-03-21  0:55 ` [PATCH 5/7] go: " Justus Winter
2012-03-21  0:55 ` [PATCH 6/7] ruby: " Justus Winter
2012-03-21  0:55 ` [PATCH 7/7] python: wrap and use notmuch_database_destroy as destructor Justus Winter
2012-04-12 17:02   ` Austin Clements
2012-04-20 13:10     ` Sebastian Spaeth
2012-04-22 12:06     ` Justus Winter
2012-04-22 12:07       ` [PATCH 1/7] Split notmuch_database_close into two functions Justus Winter
2012-04-22 12:07         ` [PATCH 2/7] NEWS: Document the notmuch_database_close split Justus Winter
2012-04-22 15:09           ` Felipe Contreras
2012-04-22 12:07         ` Justus Winter [this message]
2012-04-22 12:07         ` [PATCH 4/7] Use notmuch_database_destroy instead of notmuch_database_close Justus Winter
2012-04-22 12:07         ` [PATCH 5/7] go: " Justus Winter
2012-04-22 12:07         ` [PATCH 6/7] ruby: " Justus Winter
2012-04-23 12:36           ` Felipe Contreras
2012-04-23 12:49             ` Justus Winter
2012-04-25 13:39               ` Austin Clements
2012-04-22 12:07         ` [PATCH 7/7] python: wrap and use notmuch_database_destroy as destructor Justus Winter
2012-04-22 18:01         ` [PATCH 1/7] Split notmuch_database_close into two functions Austin Clements
2012-04-25 13:20           ` Justus Winter
2012-04-25 13:34             ` Austin Clements
2012-04-28 12:54             ` David Bremner
2012-04-22 18:06         ` Austin Clements
2012-03-21  8:57 ` [RFC] " Patrick Totzke
2012-03-24  9:07 ` Tomi Ollila
2012-03-27  8:19   ` Justus Winter
2012-03-27  8:19     ` [PATCH 1/7] " Justus Winter
2012-04-01  3:23 ` [RFC] " Austin Clements
2012-04-12  9:05   ` Justus Winter
2012-04-12 16:57     ` Austin Clements
2012-04-12 17:19       ` Justus Winter
     [not found]       ` <20120413083358.13321.66680@megatron>
2012-04-16 21:45         ` Justus Winter
2012-04-17  4:56           ` Tomi Ollila
2012-04-17  8:42       ` Mark Walters
2012-04-18 17:54         ` Austin Clements

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335096477-27537-3-git-send-email-4winter@informatik.uni-hamburg.de \
    --to=4winter@informatik.uni-hamburg.de \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).