From dcd0b593b3e4670cb6e1b9675b4664d842cae7de Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 17 Sep 2001 23:06:01 +0000 Subject: Don't process the ImapResponse data, we don't want to block forever on 2001-09-17 Jeffrey Stedfast * providers/imap/camel-imap-store.c (delete_folder): Don't process the ImapResponse data, we don't want to block forever on data we don't care about... svn path=/trunk/; revision=12918 --- camel/ChangeLog | 4 ++++ camel/providers/imap/camel-imap-store.c | 13 +++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index 215486f828..1ce5314e67 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,9 @@ 2001-09-17 Jeffrey Stedfast + * providers/imap/camel-imap-store.c (delete_folder): Don't process + the ImapResponse data, we don't want to block forever on data we + don't care about... + * camel-folder.c: Reverted previous changes. 2001-09-17 JP Rosevear diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 4dff0f3c62..dcbe2e77c6 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -1009,25 +1009,22 @@ delete_folder (CamelStore *store, const char *folder_name, CamelException *ex) { CamelImapStore *imap_store = CAMEL_IMAP_STORE (store); CamelImapResponse *response; - + if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex)) return; - + /* make sure this folder isn't currently SELECTed */ - response = camel_imap_command (imap_store, NULL, ex, "SELECT INBOX"); if (response) { - camel_imap_response_free (imap_store, response); - + camel_imap_response_free_without_processing (imap_store, response); + if (imap_store->current_folder) camel_object_unref (CAMEL_OBJECT (imap_store->current_folder)); /* no need to actually create a CamelFolder for INBOX */ imap_store->current_folder = NULL; } else return; - - /* delete the old parent and recreate it */ - + response = camel_imap_command (imap_store, NULL, ex, "DELETE %F", folder_name); if (response) -- cgit v1.2.3