From d725eacdbc6eefb19791a10cf838d7db9359b04d Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 29 Oct 2001 18:25:42 +0000 Subject: if the service is being connected and thinks it's online, but the session * camel-disco-store.c (camel_disco_store_status): if the service is being connected and thinks it's online, but the session is offline, then mark the service offline as well. Fixes 13683. svn path=/trunk/; revision=14347 --- camel/ChangeLog | 6 ++++++ camel/camel-disco-store.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/camel/ChangeLog b/camel/ChangeLog index fbc70f6db2..7db3b2b9d8 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-10-29 Dan Winship + + * camel-disco-store.c (camel_disco_store_status): if the service + is being connected and thinks it's online, but the session is + offline, then mark the service offline as well. Fixes 13683. + 2001-10-29 * camel-mime-utils.c: Turn off w() -> warnings. diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c index 95a3573729..b18d88924c 100644 --- a/camel/camel-disco-store.c +++ b/camel/camel-disco-store.c @@ -254,8 +254,15 @@ disco_get_folder_info (CamelStore *store, const char *top, CamelDiscoStoreStatus camel_disco_store_status (CamelDiscoStore *store) { + CamelService *service = CAMEL_SERVICE (store); + g_return_val_if_fail (CAMEL_IS_DISCO_STORE (store), CAMEL_DISCO_STORE_ONLINE); + if (service->status == CAMEL_SERVICE_CONNECTING && + store->status == CAMEL_DISCO_STORE_ONLINE && + !camel_session_is_online (service->session)) + store->status = CAMEL_DISCO_STORE_OFFLINE; + return store->status; } -- cgit v1.2.3