Don't instantiate an engine here. Instead, take an engine as an argument

2004-07-26  Jeffrey Stedfast  <fejj@novell.com>

	* providers/imap4/camel-imap4-store.c (connect_to_server): Don't
	instantiate an engine here. Instead, take an engine as an argument
	(it has a service pointer) and connect using that. Also, if
	connect fails, don't unref the engine.
	(connect_to_server_wrapper): Now also takes an engine argument
	rather than a service argument.
	(imap4_try_authenticate): Now also takes an engine argument.
	(imap4_connect): Pass the engine to connect/auth functions rather
	than the store.
	(imap4_query_auth_types): Updated.
	(imap4_disconnect): Don't unref the engine here.
	(camel_imap4_store_init): Create the engine here.
	(imap4_get_folder_info): Can't check engine == NULL to know to
	connect (that was a broken check anyway).

	* providers/imap4/camel-imap4-engine.c (camel_imap4_engine_new):
	Now simply takes a service argument rather than a session and url.
	(camel_imap4_engine_next_token): Set the state to DISCONNECTED.
	(camel_imap4_engine_eat_line): Same.
	(camel_imap4_engine_line): Same.
	(camel_imap4_engine_literal): Same.

svn path=/trunk/; revision=26740

1 files changed, 11 insertions, 10 deletions

diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index 25ae7ed113..1dda36ac43 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -68,14 +68,14 @@ typedef enum {
 enum {
 	CAMEL_IMAP4_CAPABILITY_IMAP44           = (1 << 0),
 	CAMEL_IMAP4_CAPABILITY_IMAP44REV1       = (1 << 1),
-	CAMEL_IMAP4_CAPABILITY_STATUS          = (1 << 2),
-	CAMEL_IMAP4_CAPABILITY_NAMESPACE       = (1 << 3),
-	CAMEL_IMAP4_CAPABILITY_UIDPLUS         = (1 << 4),
-	CAMEL_IMAP4_CAPABILITY_LITERALPLUS     = (1 << 5),
-	CAMEL_IMAP4_CAPABILITY_LOGINDISABLED   = (1 << 6),
-	CAMEL_IMAP4_CAPABILITY_STARTTLS        = (1 << 7),
-	CAMEL_IMAP4_CAPABILITY_useful_lsub     = (1 << 8),
-	CAMEL_IMAP4_CAPABILITY_utf8_search     = (1 << 9),
+	CAMEL_IMAP4_CAPABILITY_STATUS           = (1 << 2),
+	CAMEL_IMAP4_CAPABILITY_NAMESPACE        = (1 << 3),
+	CAMEL_IMAP4_CAPABILITY_UIDPLUS          = (1 << 4),
+	CAMEL_IMAP4_CAPABILITY_LITERALPLUS      = (1 << 5),
+	CAMEL_IMAP4_CAPABILITY_LOGINDISABLED    = (1 << 6),
+	CAMEL_IMAP4_CAPABILITY_STARTTLS         = (1 << 7),
+	CAMEL_IMAP4_CAPABILITY_useful_lsub      = (1 << 8),
+	CAMEL_IMAP4_CAPABILITY_utf8_search      = (1 << 9),
 };
 
 typedef enum {
@@ -147,11 +147,12 @@ struct _CamelIMAP4Engine {
 	CamelObject parent_object;
 	
 	CamelSession *session;
+	CamelService *service;
 	CamelURL *url;
 	
 	camel_imap4_engine_t state;
 	camel_imap4_level_t level;
-	guint32 capa;
+	guint32 capa:31;
 	
 	guint32 maxlen:31;
 	guint32 maxlentype:1;
@@ -181,7 +182,7 @@ struct _CamelIMAP4EngineClass {
 
 CamelType camel_imap4_engine_get_type (void);
 
-CamelIMAP4Engine *camel_imap4_engine_new (CamelSession *session, CamelURL *url);
+CamelIMAP4Engine *camel_imap4_engine_new (CamelService *service);
 
 /* returns 0 on success or -1 on error */
 int camel_imap4_engine_take_stream (CamelIMAP4Engine *engine, CamelStream *stream, CamelException *ex);