[evolution-data-server/gnome-3-6] Bug #687642 - Crash under caldav_synch_slave_loop()

[Milan Crha <mcrha src gnome org>]

commit a72fce911a90e0645cf3e05366a7fdb095aa0da3
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 7 13:09:18 2012 +0100

    Bug #687642 - Crash under caldav_synch_slave_loop()

 calendar/backends/caldav/e-cal-backend-caldav.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 62af8c7..d707a56 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -2434,11 +2434,11 @@ caldav_synch_slave_loop (gpointer data)
 		g_cond_wait (cbdav->priv->cond, cbdav->priv->busy_lock);
 	}
 
+	cbdav->priv->synch_slave = NULL;
+
 	/* signal we are done */
 	g_cond_signal (cbdav->priv->slave_gone_cond);
 
-	cbdav->priv->synch_slave = NULL;
-
 	/* we got killed ... */
 	g_mutex_unlock (cbdav->priv->busy_lock);
 	return NULL;
@@ -4979,7 +4979,7 @@ e_cal_backend_caldav_dispose (GObject *object)
 	}
 
 	/* stop the slave  */
-	if (priv->synch_slave) {
+	while (priv->synch_slave) {
 		g_cond_signal (priv->cond);
 
 		/* wait until the slave died */