diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2004-07-30 21:02:19 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-07-30 21:02:19 +0000 |
| commit | 7166905b8ea6d5b8f0f5fbbceb1a1fcd2d10739b (patch) | |
| tree | d53dd2d6168845f33cb33a177453aa4da4014ae1 | |
| parent | ed60b23df913afe4d453d1fea390d54d8bc02343 (diff) | |
| download | evolution-data-server-evolution-1-5-92.tar.gz | |
This needs to prequeue the CAPABILITY command rather than queue itEVOLUTION_1_5_92_2EVOLUTION_1_5_92_1EVOLUTION_1_5_92evolution-1-5-92
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.
| -rw-r--r-- | camel/ChangeLog | 8 | ||||
| -rw-r--r-- | camel/providers/imap4/camel-imap4-engine.c | 6 | ||||
| -rw-r--r-- | camel/providers/imap4/camel-imap4-engine.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 8ca3c6945..e5251d294 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 82b19bac8..b1a2bbc2e 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 e818d58bb..8d97011be 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; |