From 8e4e1a28803e7240f1e96d78a15eb93ee6317da4 Mon Sep 17 00:00:00 2001
From: Clemens Zeidler <clemens.zeidler@googlemail.com>
Date: Tue, 1 Mar 2011 03:19:15 +0000
Subject: [PATCH] Reset status view when fetch failed.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40752 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../inbound_protocols/imap/IMAPInboundProtocol.cpp |  7 +++++++
 .../inbound_protocols/imap/IMAPInboundProtocol.h   |  1 +
 .../imap/imap_lib/IMAPHandler.cpp                  | 14 ++++++++++----
 .../inbound_protocols/imap/imap_lib/IMAPHandler.h  |  1 +
 .../inbound_protocols/imap/imap_lib/IMAPMailbox.h  |  1 +
 5 files changed, 20 insertions(+), 4 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 49929aeee3..579f4a3989 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.cpp
@@ -61,6 +61,13 @@ DispatcherIMAPListener::NewMessagesToFetch(int32 nMessages)
 }
 
 
+void
+DispatcherIMAPListener::FetchEnd()
+{
+	fProtocol.ResetProgress();
+}
+
+
 const uint32 kMsgStartWatching = '&StW';
 
 
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.h b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.h
index 998a2243c1..8972b33f5f 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/IMAPInboundProtocol.h
@@ -31,6 +31,7 @@ public:
 			void				BodyFetched(int32 uid, BPositionIO* data);
 
 			void				NewMessagesToFetch(int32 nMessages);
+			void				FetchEnd();
 private:
 			MailProtocol&		fProtocol;
 			IMAPStorage&		fStorage;
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
index c46ebba221..ad248d42a8 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.cpp
@@ -306,7 +306,7 @@ FetchMessageCommand::FetchMessageCommand(IMAPMailbox& mailbox, int32 message,
 	fOutData(data),
 	fFetchBodyLimit(fetchBodyLimit)
 {
-
+	fIMAPMailbox.Listener().NewMessagesToFetch(fEndMessage - fMessage + 1);
 }
 
 
@@ -320,7 +320,13 @@ FetchMessageCommand::FetchMessageCommand(IMAPMailbox& mailbox,
 	fOutData(NULL),
 	fFetchBodyLimit(fetchBodyLimit)
 {
-	
+	fIMAPMailbox.Listener().NewMessagesToFetch(fEndMessage - fMessage + 1);
+}
+
+
+FetchMessageCommand::~FetchMessageCommand()
+{
+	fIMAPMailbox.Listener().FetchEnd();
 }
 
 
@@ -478,6 +484,8 @@ FetchBodyCommand::Handle(const BString& response)
 	int32 uid = fIMAPMailbox.MessageNumberToUID(message);
 	if (uid >= 0)
 		fIMAPMailbox.Listener().BodyFetched(uid, fOutData);
+	else
+		fIMAPMailbox.Listener().FetchEnd();
 
 	return true;
 }
@@ -615,8 +623,6 @@ ExistsHandler::Handle(const BString& response)
 		nMessages + 1, exists, &list, NULL);
 	fIMAPMailbox.AddAfterQuakeCommand(command);
 
-	fIMAPMailbox.Listener().NewMessagesToFetch(exists - nMessages);
-
 	command = new FetchMessageCommand(fIMAPMailbox, nMessages + 1, exists,
 		fIMAPMailbox.FetchBodyLimit());
 	fIMAPMailbox.AddAfterQuakeCommand(command);
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.h b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.h
index 580c733862..5443b31651 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPHandler.h
@@ -130,6 +130,7 @@ public:
 								FetchMessageCommand(IMAPMailbox& mailbox,
 									int32 firstMessage, int32 lastMessage,
 									int32 fetchBodyLimit = -1);
+								~FetchMessageCommand();
 
 			BString				Command();
 			bool				Handle(const BString& response);
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
index ecf0a4caf9..c8de502082 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_lib/IMAPMailbox.h
@@ -22,6 +22,7 @@ public:
 	virtual void				BodyFetched(int32 uid, BPositionIO* data) {}
 
 	virtual	void				NewMessagesToFetch(int32 nMessages) {}
+	virtual	void				FetchEnd() {}
 };