From: Timo Sirainen <tss@iki.fi>
Date: Sun, 23 Nov 2008 22:08:03 +0000 (+0200)
Subject: Call next hook_mail_namespaces_created in correct order.
X-Git-Tag: 1.2.alpha4~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54bea30840d9ba6d6ed55235458714659507d5b2;p=thirdparty%2Fdovecot%2Fcore.git

Call next hook_mail_namespaces_created in correct order.

--HG--
branch : HEAD
---

diff --git a/src/plugins/autocreate/autocreate-plugin.c b/src/plugins/autocreate/autocreate-plugin.c
index bf5cf0e616..d4a8adf254 100644
--- a/src/plugins/autocreate/autocreate-plugin.c
+++ b/src/plugins/autocreate/autocreate-plugin.c
@@ -55,11 +55,11 @@ static void autosubscribe_mailboxes(struct mail_namespace *namespaces)
 static void
 autocreate_mail_namespaces_created(struct mail_namespace *namespaces)
 {
-	if (autocreate_next_hook_mail_namespaces_created != NULL)
-		autocreate_next_hook_mail_namespaces_created(namespaces);
-
 	autocreate_mailboxes(namespaces);
 	autosubscribe_mailboxes(namespaces);
+
+	if (autocreate_next_hook_mail_namespaces_created != NULL)
+		autocreate_next_hook_mail_namespaces_created(namespaces);
 }
 
 void autocreate_plugin_init(void)
diff --git a/src/plugins/trash/trash-plugin.c b/src/plugins/trash/trash-plugin.c
index 2870f0755f..3381aa7cb2 100644
--- a/src/plugins/trash/trash-plugin.c
+++ b/src/plugins/trash/trash-plugin.c
@@ -302,29 +302,25 @@ trash_hook_mail_namespaces_created(struct mail_namespace *namespaces)
 	struct trash_user *tuser;
 	const char *env;
 
-	if (trash_next_hook_mail_namespaces_created != NULL)
-		trash_next_hook_mail_namespaces_created(namespaces);
-
 	env = getenv("TRASH");
 	if (env == NULL) {
 		if (getenv("DEBUG") != NULL)
 			i_info("trash: No trash setting - plugin disabled");
-		return;
-	}
-
-	if (quota_set == NULL) {
+	} else if (quota_set == NULL) {
 		i_error("trash plugin: quota plugin not initialized");
-		return;
+	} else {
+		tuser = p_new(user->pool, struct trash_user, 1);
+		tuser->module_ctx.super = user->v;
+		MODULE_CONTEXT_SET(user, trash_user_module, tuser);
+
+		if (read_configuration(user, env) == 0) {
+			trash_next_quota_test_alloc = quota_set->test_alloc;
+			quota_set->test_alloc = trash_quota_test_alloc;
+		}
 	}
 
-	tuser = p_new(user->pool, struct trash_user, 1);
-	tuser->module_ctx.super = user->v;
-	MODULE_CONTEXT_SET(user, trash_user_module, tuser);
-
-	if (read_configuration(user, env) == 0) {
-		trash_next_quota_test_alloc = quota_set->test_alloc;
-		quota_set->test_alloc = trash_quota_test_alloc;
-	}
+	if (trash_next_hook_mail_namespaces_created != NULL)
+		trash_next_hook_mail_namespaces_created(namespaces);
 }
 
 void trash_plugin_init(void)