Always just return 0, don't try to PR_Sync() - fsync on a socket causes an

2004-06-04  Jeffrey Stedfast  <fejj@novell.com>

	* camel-tcp-stream-ssl.c (stream_flush): Always just return 0,
	don't try to PR_Sync() - fsync on a socket causes an error.

	* providers/imap4/camel-imap4-command.c
	(camel_imap4_command_step): Set exceptions when write/flush fail.

	* providers/imap4/camel-imap4-engine.c
	(camel_imap4_engine_take_stream): Set an exception in the case
	where we get an unexpected greeting from the server.

	* providers/imap4/camel-imap4-store.c (imap4_create_folder):
	store->dir_sep no longer exists, so query the engine for the
	directory separator for the parent_folder.
	(imap4_build_folder_info): CamelFolderInfo no longer has a path
	component.

svn path=/trunk/; revision=26217

1 files changed, 5 insertions, 1 deletions

diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index a84ac1dfba..be4a7e8c02 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -229,7 +229,8 @@ camel_imap4_engine_take_stream (CamelIMAP4Engine *engine, CamelStream *stream, C
 	if ((code = camel_imap4_engine_handle_untagged_1 (engine, &token, ex)) == -1) {
 		goto exception;
 	} else if (code != CAMEL_IMAP4_UNTAGGED_OK && code != CAMEL_IMAP4_UNTAGGED_PREAUTH) {
-		/* FIXME: set an error? */
+		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Unexpected greeting from IMAP server %s."),
+				      engine->url->host);
 		goto exception;
 	}
 	
@@ -268,7 +269,10 @@ camel_imap4_engine_capability (CamelIMAP4Engine *engine, CamelException *ex)
 	while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
 		;
 	
+	fprintf (stderr, "id = %d; status = %d\n", id, ic->status);
+	
 	if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
+		fprintf (stderr, "exception: %s\n", ic->ex.desc);
 		camel_exception_xfer (ex, &ic->ex);
 		retval = -1;
 	}