dovecot-2.0-pigeonhole: Adjusted to change in Dovecot Storage API.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.0-pigeonhole/rev/9a08762faffe
changeset: 1235:9a08762faffe
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Feb 07 17:45:55 2010 +0100
description:
Adjusted to change in Dovecot Storage API.

diffstat:

 src/lib-sieve-tool/mail-raw.c                      |   2 +-
 src/lib-sieve/plugins/mailbox/tag-mailbox-create.c |   4 ++--
 src/lib-sieve/plugins/mailbox/tst-mailboxexists.c  |   2 +-
 src/lib-sieve/sieve-actions.c                      |  12 ++++++------
 src/testsuite/testsuite-mailstore.c                |   6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diffs (127 lines):

diff -r 7b3db97399de -r 9a08762faffe src/lib-sieve-tool/mail-raw.c
--- a/src/lib-sieve-tool/mail-raw.c	Sun Jan 31 17:06:24 2010 +0100
+++ b/src/lib-sieve-tool/mail-raw.c	Sun Feb 07 17:45:55 2010 +0100
@@ -291,7 +291,7 @@
 {
 	mail_free(&mailr->mail);
 	mailbox_transaction_rollback(&mailr->trans);
-	mailbox_close(&mailr->box);
+	mailbox_free(&mailr->box);
 
 	pool_unref(&mailr->pool);
 }
diff -r 7b3db97399de -r 9a08762faffe src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
--- a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c	Sun Jan 31 17:06:24 2010 +0100
+++ b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c	Sun Feb 07 17:45:55 2010 +0100
@@ -145,7 +145,7 @@
     box = mailbox_alloc(trans->namespace->list, trans->folder, NULL, flags);
 	/* Create mailbox */
 	if ( mailbox_create(box, NULL, FALSE) < 0 ) {
-		mailbox_close(&box);
+		mailbox_free(&box);
 		box = NULL;
 
 	} else {
@@ -158,7 +158,7 @@
 		/* Try opening again */
 		if ( mailbox_sync(box, 0) < 0 ) {
 			/* Failed definitively */
-			mailbox_close(&box);
+			mailbox_free(&box);
 			box = NULL;
 		}
 	} 
diff -r 7b3db97399de -r 9a08762faffe src/lib-sieve/plugins/mailbox/tst-mailboxexists.c
--- a/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c	Sun Jan 31 17:06:24 2010 +0100
+++ b/src/lib-sieve/plugins/mailbox/tst-mailboxexists.c	Sun Feb 07 17:45:55 2010 +0100
@@ -155,7 +155,7 @@
 			/* FIXME: check acl for 'p' or 'i' ACL permissions as required by RFC */
 
 			/* Close mailbox */
-			mailbox_close(&box);
+			mailbox_free(&box);
 		}
 	}
 	
diff -r 7b3db97399de -r 9a08762faffe src/lib-sieve/sieve-actions.c
--- a/src/lib-sieve/sieve-actions.c	Sun Jan 31 17:06:24 2010 +0100
+++ b/src/lib-sieve/sieve-actions.c	Sun Feb 07 17:45:55 2010 +0100
@@ -320,14 +320,14 @@
 	 * create it.
 	 */
 	if ( !aenv->scriptenv->mailbox_autocreate || error != MAIL_ERROR_NOTFOUND ) {
-		mailbox_close(&box);
+		mailbox_free(&box);
 		return NULL;
 	}
 
 	/* Try creating it. */
 	if ( mailbox_create(box, NULL, FALSE) < 0 ) {
 		(void)mail_storage_get_last_error(*storage, &error);
-		mailbox_close(&box);
+		mailbox_free(&box);
 		return NULL;
 	}
 
@@ -339,7 +339,7 @@
 	/* Try opening again */
 	if ( mailbox_sync(box, 0) < 0 ) {
 		/* Failed definitively */
-		mailbox_close(&box);
+		mailbox_free(&box);
 		return NULL;
 	}
 
@@ -378,7 +378,7 @@
 		 * originates from. In that case we skip actually storing it.
 		 */
 		if ( box != NULL && mailbox_backends_equal(box, msgdata->mail->box) ) {
-			mailbox_close(&box);
+			mailbox_free(&box);
 			box = NULL;
 			ns = NULL;
 			redundant = TRUE;
@@ -613,7 +613,7 @@
 	
 	/* Close mailbox */	
 	if ( trans->box != NULL )
-		mailbox_close(&trans->box);
+		mailbox_free(&trans->box);
 
 	return status;
 }
@@ -638,7 +638,7 @@
   
 	/* Close the mailbox */
 	if ( trans->box != NULL )  
-		mailbox_close(&trans->box);
+		mailbox_free(&trans->box);
 }
 
 /*
diff -r 7b3db97399de -r 9a08762faffe src/testsuite/testsuite-mailstore.c
--- a/src/testsuite/testsuite-mailstore.c	Sun Jan 31 17:06:24 2010 +0100
+++ b/src/testsuite/testsuite-mailstore.c	Sun Feb 07 17:45:55 2010 +0100
@@ -123,11 +123,11 @@
 	box = mailbox_alloc(ns->list, folder, NULL, 0);
 
 	if ( mailbox_create(box, NULL, FALSE) < 0 ) {
-		mailbox_close(&box);
+		mailbox_free(&box);
 		return FALSE;
 	}
 
-	mailbox_close(&box);
+	mailbox_free(&box);
 
 	return TRUE;
 }
@@ -141,7 +141,7 @@
 		mailbox_transaction_rollback(&testsuite_mailstore_trans);
 		
 	if ( testsuite_mailstore_box != NULL )
-		mailbox_close(&testsuite_mailstore_box);
+		mailbox_free(&testsuite_mailstore_box);
 
 	if ( testsuite_mailstore_folder != NULL )
 		i_free(testsuite_mailstore_folder);