Fix this to always set an exception if it returns POP3_FAIL, as

	* providers/pop3/camel-pop3-store.c (pop3_get_response): Fix this
	to always set an exception if it returns POP3_FAIL, as documented.

	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):
	Revert.

svn path=/trunk/; revision=12654

1 files changed, 3 insertions, 5 deletions

diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index a87c77f3a1..d18680dddd 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -40,8 +40,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <errno.h>
-
 #define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))
 static CamelFolderClass *parent_class;
 
@@ -333,11 +331,11 @@ pop3_get_message_stream (CamelFolder *folder, int id, gboolean headers_only, Cam
 				     &result, ex, headers_only ? "TOP %d 0" : "RETR %d", id);
 	switch (status) {
 	case CAMEL_POP3_ERR:
-	case CAMEL_POP3_FAIL:
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not fetch message: %s"), result ? result :
-				      errno ? g_strerror (errno) : _("Unknown error"));
+				      _("Could not fetch message: %s"), result);
 		g_free (result);
+		/* fall through */
+	case CAMEL_POP3_FAIL:
 		camel_operation_end (NULL);
 		return NULL;
 	}