From a68750c1ac950ddedab035c8ac2c5e532ae7ef77 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Wed, 9 Feb 2011 22:22:26 +0000
Subject: [PATCH] Fix spelling and potential deadlock.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40414 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../inbound_protocols/imap/IMAPInboundProtocol.cpp          | 6 +++---
 .../inbound_protocols/imap/imap_lib/IMAPStorage.cpp         | 4 +---
 .../inbound_protocols/imap/imap_lib/IMAPStorage.h           | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
index 04a3ab176d..b800a657f6 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
@@ -337,7 +337,7 @@ IMAPInboundProtocol::Connect(const char* server, const char* username,
 	fStorage.StartReadDatabase();
 	status = fIMAPMailbox.SelectMailbox(fMailboxName);
 	if (status != B_OK) {
-		fStorage.WaitForDatabaseReaded();
+		fStorage.WaitForDatabaseRead();
 		statusMessage = "Failed to select mailbox (";
 		statusMessage += fMailboxName;
 		statusMessage += "): ";
@@ -350,14 +350,14 @@ IMAPInboundProtocol::Connect(const char* server, const char* username,
 	ReportProgress(0, 1, "Fetch message list");
 	status = fIMAPMailbox.Sync();
 	if (status != B_OK) {
-		fStorage.WaitForDatabaseReaded();
+		fStorage.WaitForDatabaseRead();
 		ShowError("Failed to sync mailbox");
 		ResetProgress();
 		return status;
 	}
 
 	ReportProgress(0, 1, "Read local message list");
-	status = fStorage.WaitForDatabaseReaded();
+	status = fStorage.WaitForDatabaseRead();
 	if (status != B_OK) {
 		ShowError("Can't read database");
 		ResetProgress();
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
index 540f880ecf..3c4e8c66ea 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.cpp
@@ -25,8 +25,6 @@
 status_t
 IMAPMailboxSync::Sync(IMAPStorage& storage, IMAPMailbox& mailbox)
 {
-	storage.WaitForDatabaseReaded();
-
 	const MailEntryMap& files = storage.GetFiles();
 	const MinMessageList& messages = mailbox.GetMessageList();
 
@@ -151,7 +149,7 @@ IMAPStorage::StartReadDatabase()
 
 
 status_t
-IMAPStorage::WaitForDatabaseReaded()
+IMAPStorage::WaitForDatabaseRead()
 {
 	// just wait for thread
 	if (acquire_sem(fLoadDatabaseLock) != B_OK)
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
index dead7e9102..185ea1e04c 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPStorage.h
@@ -52,7 +52,7 @@ public:
 			void				SetTo(const char* dir);
 
 			status_t			StartReadDatabase();
-			status_t			WaitForDatabaseReaded();
+			status_t			WaitForDatabaseRead();
 
 			status_t			AddNewMessage(int32 uid, int32 flags,
 									BPositionIO** file = NULL);