From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Apr 2010 22:22:23 +0000 (+0300)
Subject: layout=maildir++: Minor code cleanup.
X-Git-Tag: 2.0.beta5~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33052869dd5aeb4fcf7e8ec28a06ad57b0eb80b0;p=thirdparty%2Fdovecot%2Fcore.git

layout=maildir++: Minor code cleanup.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/list/mailbox-list-maildir-iter.c b/src/lib-storage/list/mailbox-list-maildir-iter.c
index 5ec880ba9d..fb5ed9771d 100644
--- a/src/lib-storage/list/mailbox-list-maildir-iter.c
+++ b/src/lib-storage/list/mailbox-list-maildir-iter.c
@@ -147,18 +147,19 @@ maildir_fill_inbox(struct maildir_list_iterate_context *ctx,
 			update_only = TRUE;
 	}
 
-	created = FALSE;
-	node = update_only ?
-		mailbox_tree_lookup(ctx->tree_ctx, "INBOX") :
-		mailbox_tree_get(ctx->tree_ctx, "INBOX", &created);
-	if (created)
-		node->flags = MAILBOX_NOCHILDREN;
-	else if (node != NULL)
-		node->flags &= ~MAILBOX_NONEXISTENT;
-
-	match = imap_match(glob, "INBOX");
-	if ((match & (IMAP_MATCH_YES | IMAP_MATCH_PARENT)) != 0) {
-		if (!update_only)
+	if (update_only) {
+		node = mailbox_tree_lookup(ctx->tree_ctx, "INBOX");
+		if (node != NULL)
+			node->flags &= ~MAILBOX_NONEXISTENT;
+	} else {
+		node = mailbox_tree_get(ctx->tree_ctx, "INBOX", &created);
+		if (created)
+			node->flags = MAILBOX_NOCHILDREN;
+		else
+			node->flags &= ~MAILBOX_NONEXISTENT;
+
+		match = imap_match(glob, "INBOX");
+		if ((match & (IMAP_MATCH_YES | IMAP_MATCH_PARENT)) != 0)
 			node->flags |= MAILBOX_MATCHED;
 	}
 	return 0;