aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/providers/imap4/camel-imap4-engine.c6
-rw-r--r--camel/providers/imap4/camel-imap4-engine.h2
3 files changed, 12 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8ca3c69459..e5251d294a 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-30 Jeffrey Stedfast <fejj@novell.com>
+
+ * providers/imap4/camel-imap4-engine.c
+ (camel_imap4_engine_capability): This needs to prequeue the
+ CAPABILITY command rather than queue it normally for the case of
+ reconnecting.
+ (camel_imap4_engine_namespace): Same.
+
2004-07-30 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-utils.c (camel_header_encode_string): Similar fix as
diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index 82b19bac86..b1a2bbc2e9 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -261,7 +261,7 @@ camel_imap4_engine_capability (CamelIMAP4Engine *engine, CamelException *ex)
CamelIMAP4Command *ic;
int id, retval = 0;
- ic = camel_imap4_engine_queue (engine, NULL, "CAPABILITY\r\n");
+ ic = camel_imap4_engine_prequeue (engine, NULL, "CAPABILITY\r\n");
while ((id = camel_imap4_engine_iterate (engine)) < ic->id && id != -1)
;
@@ -295,9 +295,9 @@ camel_imap4_engine_namespace (CamelIMAP4Engine *engine, CamelException *ex)
int id, i;
if (engine->capa & CAMEL_IMAP4_CAPABILITY_NAMESPACE) {
- ic = camel_imap4_engine_queue (engine, NULL, "NAMESPACE\r\n");
+ ic = camel_imap4_engine_prequeue (engine, NULL, "NAMESPACE\r\n");
} else {
- ic = camel_imap4_engine_queue (engine, NULL, "LIST \"\" \"\"\r\n");
+ ic = camel_imap4_engine_prequeue (engine, NULL, "LIST \"\" \"\"\r\n");
camel_imap4_command_register_untagged (ic, "LIST", camel_imap4_untagged_list);
ic->user_data = array = g_ptr_array_new ();
}
diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h
index e818d58bbf..8d97011be4 100644
--- a/camel/providers/imap4/camel-imap4-engine.h
+++ b/camel/providers/imap4/camel-imap4-engine.h
@@ -152,7 +152,7 @@ struct _CamelIMAP4Engine {
camel_imap4_engine_t state;
camel_imap4_level_t level;
- guint32 capa:31;
+ guint32 capa;
guint32 maxlen:31;
guint32 maxlentype:1;