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, 3 deletions

diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 85ae32407a..8e228be71a 100644
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -773,11 +773,14 @@ imap4_create_folder (CamelStore *store, const char *parent_name, const char *fol
 	char *utf7_name;
 	const char *c;
 	char *name;
+	char sep;
 	int id;
 	
+	sep = imap4_get_path_delim (engine, parent_name);
+	
 	c = folder_name;
 	while (*c != '\0') {
-		if (*c == store->dir_sep || strchr ("#%*", *c)) {
+		if (*c == sep || strchr ("/#%*", *c)) {
 			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
 					      _("The folder name \"%s\" is invalid because "
 						"it contains the character \"%c\""),
@@ -959,12 +962,11 @@ imap4_build_folder_info (CamelIMAP4Engine *engine, guint32 flags, GPtrArray *arr
 			p++;
 		}
 		
+		p = strrchr (name, '/');
 		camel_url_set_fragment (url, name);
 		
 		fi->full_name = name;
-		p = strrchr (name, '/');
 		fi->name = g_strdup (p ? p + 1: name);
-		fi->path = g_strdup_printf ("/%s", name);
 		fi->uri = camel_url_to_string (url, 0);
 		fi->flags = list->flags;