[evolution-data-server] Bug #677685 - WebCal backend doesn't stop opening phase on error
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Bug #677685 - WebCal backend doesn't stop opening phase on error
- Date: Fri, 14 Sep 2012 12:42:58 +0000 (UTC)
commit 8508d0e490c1b72a77a7ea86775ef250b5c0b05d
Author: Milan Crha <mcrha redhat com>
Date: Fri Sep 14 14:41:17 2012 +0200
Bug #677685 - WebCal backend doesn't stop opening phase on error
calendar/backends/http/e-cal-backend-http.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 53f0867..69bd679 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -844,6 +844,7 @@ e_cal_backend_http_open (ECalBackendSync *backend,
gboolean opened = TRUE;
gboolean online;
gchar *tmp;
+ GError *local_error = NULL;
cbhttp = E_CAL_BACKEND_HTTP (backend);
priv = cbhttp->priv;
@@ -899,7 +900,6 @@ e_cal_backend_http_open (ECalBackendSync *backend,
if (online) {
const gchar *uri;
- GError *local_error = NULL;
uri = cal_backend_http_ensure_uri (cbhttp);
@@ -921,15 +921,15 @@ e_cal_backend_http_open (ECalBackendSync *backend,
}
if (local_error != NULL)
- g_propagate_error (perror, local_error);
+ g_propagate_error (perror, g_error_copy (local_error));
}
if (opened) {
- e_cal_backend_notify_opened (E_CAL_BACKEND (backend), NULL);
-
if (!priv->reload_timeout_id)
priv->reload_timeout_id = e_source_refresh_add_timeout (source, NULL, http_cal_reload_cb, backend, NULL);
}
+
+ e_cal_backend_notify_opened (E_CAL_BACKEND (backend), local_error);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]