[PATCH 05/18] Attempt to fix the queue<->account refcount loop in a thread safe way.

[Rob Taylor <rob taylor codethink co uk>]

Attempt to fix the queue<->account refcount loop in a thread safe way.
Its now implicit that the lifetime of the queue muct be within the
lifetime of the parent.

---
  libtinymail-camel/tny-camel-account.c       |    1 +
  libtinymail-camel/tny-camel-queue-priv.h    |    1 +
  libtinymail-camel/tny-camel-queue.c         |   29
+++++++++++++++++++++++---
  libtinymail-camel/tny-camel-store-account.c |    1 +
  4 files changed, 28 insertions(+), 4 deletions(-)


--
Rob Taylor, Codethink Ltd. - http://codethink.co.uk

diff --git a/libtinymail-camel/tny-camel-account.c b/libtinymail-camel/tny-camel-account.c
index b505c5a..9e2887f 100644
--- a/libtinymail-camel/tny-camel-account.c
+++ b/libtinymail-camel/tny-camel-account.c
@@ -2198,6 +2198,7 @@ tny_camel_account_finalize (GObject *object)
 
 	g_static_rec_mutex_unlock (priv->service_lock);
 
+	_tny_camel_queue_stop (priv->queue);
 	g_object_unref (priv->queue);
 	g_object_unref (priv->con_strat);
 
diff --git a/libtinymail-camel/tny-camel-queue-priv.h b/libtinymail-camel/tny-camel-queue-priv.h
index 4febfd7..b6397b2 100644
--- a/libtinymail-camel/tny-camel-queue-priv.h
+++ b/libtinymail-camel/tny-camel-queue-priv.h
@@ -83,6 +83,7 @@ void _tny_camel_queue_launch_wflags (TnyCamelQueue *queue, GThreadFunc func, GSo
 void _tny_camel_queue_launch (TnyCamelQueue *queue, GThreadFunc func, GSourceFunc callback, GDestroyNotify destroyer, GSourceFunc cancel_callback, GDestroyNotify cancel_destroyer, gboolean *cancel_field, gpointer data, gsize data_size, const gchar *name);
 void _tny_camel_queue_remove_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
 void _tny_camel_queue_cancel_remove_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
+void _tny_camel_queue_stop (TnyCamelQueue *queue);
 
 G_END_DECLS
 
diff --git a/libtinymail-camel/tny-camel-queue.c b/libtinymail-camel/tny-camel-queue.c
index 4b89675..e669b22 100644
--- a/libtinymail-camel/tny-camel-queue.c
+++ b/libtinymail-camel/tny-camel-queue.c
@@ -271,20 +271,20 @@ tny_camel_queue_thread_main_func (gpointer user_data)
 			g_slice_free (QueueItem, item);
 
 		if (wait) {
+			g_object_ref (queue);
 			g_mutex_lock (queue->mutex);
 			queue->is_waiting = TRUE;
 			g_cond_wait (queue->condition, queue->mutex);
 			queue->is_waiting = FALSE;
 			g_mutex_unlock (queue->mutex);
+			g_object_unref (queue);
 		}
 	}
 
-	queue->thread = NULL;
 	queue->stopped = TRUE;
 
 	g_object_unref (queue);
-
-	return NULL;
+	g_thread_exit (NULL);
 }
 
 
@@ -443,7 +443,7 @@ _tny_camel_queue_launch_wflags (TnyCamelQueue *queue, GThreadFunc func, GSourceF
 		queue->stopped = FALSE;
 		g_object_ref (queue);
 		queue->thread = g_thread_create (tny_camel_queue_thread_main_func, 
-			queue, FALSE, &err);
+			queue, TRUE, &err);
 		if (err) {
 			queue->stopped = TRUE;
 		}
@@ -488,6 +488,27 @@ _tny_camel_queue_launch (TnyCamelQueue *queue, GThreadFunc func, GSourceFunc cal
 	return;
 }
 
+/**
+ * _tny_camel_queue_stop
+ * @queue: the queue
+ *
+ * Stop the thread and wait for it to finish
+ */
+void
+_tny_camel_queue_stop (TnyCamelQueue *queue)
+{
+
+	if (queue->thread) {
+		queue->stopped = TRUE;
+		g_mutex_lock (queue->mutex);
+		if (queue->is_waiting)
+			g_cond_broadcast (queue->condition);
+		g_mutex_unlock (queue->mutex);
+
+		g_thread_join (queue->thread);
+	}
+}
+
 static void 
 tny_camel_queue_class_init (TnyCamelQueueClass *class)
 {
diff --git a/libtinymail-camel/tny-camel-store-account.c b/libtinymail-camel/tny-camel-store-account.c
index 76d59c9..749f6d9 100644
--- a/libtinymail-camel/tny-camel-store-account.c
+++ b/libtinymail-camel/tny-camel-store-account.c
@@ -832,6 +832,7 @@ tny_camel_store_account_dispose (GObject *object)
 		camel_object_unref (CAMEL_OBJECT (priv->iter_store));
 	}
 
+	_tny_camel_queue_stop (priv->msg_queue);
 	g_object_unref (priv->msg_queue);
 
 	return;