[evolution-data-server] Avoid crash in e-cal-backend-http.c:webcal_to_http_method



commit 7d00b444443233ced4629a32749e7e5085c61720
Author: Milan Crha <mcrha redhat com>
Date:   Fri Nov 25 11:22:26 2011 +0100

    Avoid crash in e-cal-backend-http.c:webcal_to_http_method

 calendar/backends/http/e-cal-backend-http.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index ad9721e..0282896 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -93,6 +93,17 @@ e_cal_backend_http_dispose (GObject *object)
 	cbhttp = E_CAL_BACKEND_HTTP (object);
 	priv = cbhttp->priv;
 
+	if (priv->reload_timeout_id) {
+		g_source_remove (priv->reload_timeout_id);
+		priv->reload_timeout_id = 0;
+	}
+
+	if (priv->soup_session) {
+		soup_session_abort (priv->soup_session);
+		g_object_unref (priv->soup_session);
+		priv->soup_session = NULL;
+	}
+
 	e_credentials_free (priv->credentials);
 	priv->credentials = NULL;
 
@@ -130,17 +141,6 @@ e_cal_backend_http_finalize (GObject *object)
 		priv->uri = NULL;
 	}
 
-	if (priv->soup_session) {
-		soup_session_abort (priv->soup_session);
-		g_object_unref (priv->soup_session);
-		priv->soup_session = NULL;
-	}
-
-	if (priv->reload_timeout_id) {
-		g_source_remove (priv->reload_timeout_id);
-		priv->reload_timeout_id = 0;
-	}
-
 	g_free (priv);
 	cbhttp->priv = NULL;
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]