From: Milan Crha <mcrha@redhat.com>
Date: Fri, 14 Sep 2012 12:41:17 +0000 (+0200)
Subject: Bug #677685 - WebCal backend doesn't stop opening phase on error
X-Git-Tag: upstream/3.7.4~443
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8508d0e490c1b72a77a7ea86775ef250b5c0b05d;p=platform%2Fupstream%2Fevolution-data-server.git

Bug #677685 - WebCal backend doesn't stop opening phase on error
---

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