[evolution-data-server] CamelStore: Update "host-reachable" before connecting.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] CamelStore: Update "host-reachable" before connecting.
- Date: Fri, 22 Nov 2013 22:16:36 +0000 (UTC)
commit 9d6d7cdb2a8bae3f77f03a857f6830f51d96ca32
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Nov 22 17:08:45 2013 -0500
CamelStore: Update "host-reachable" before connecting.
camel/camel-store.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 6cd0a73..bd02f56 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -37,6 +37,7 @@
#include "camel-db.h"
#include "camel-debug.h"
#include "camel-folder.h"
+#include "camel-network-service.h"
#include "camel-offline-store.h"
#include "camel-session.h"
#include "camel-store.h"
@@ -318,7 +319,14 @@ store_maybe_connect_sync (CamelStore *store,
status = camel_service_get_connection_status (service);
connect = (status != CAMEL_SERVICE_CONNECTED);
- if (CAMEL_IS_OFFLINE_STORE (store)) {
+ if (connect && CAMEL_IS_NETWORK_SERVICE (store)) {
+ /* Disregard errors here. Just want to
+ * know whether to attempt a connection. */
+ connect = camel_network_service_can_reach_sync (
+ CAMEL_NETWORK_SERVICE (service), cancellable, NULL);
+ }
+
+ if (connect && CAMEL_IS_OFFLINE_STORE (store)) {
CamelOfflineStore *offline_store;
offline_store = CAMEL_OFFLINE_STORE (store);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]