** Fixes bug #362638

2007-12-20  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #362638

	* calendar/gui/alarm-notify/alarm-notify.c:
	* calendar/gui/alarm-notify/alarm-notify.h:
	* calendar/gui/alarm-notify/alarm-queue.c:
	Rewrite message passing to use GThreadPool instead of EThread.

	* mail/mail-mt.h:
	Overhaul the message passing API:
	- Define a MailMsg type as the base message struct.
	- Define types for the various callback functions.
	- Add a priority value to each message (not yet used).
	- Add a reference count to each message.
	- Define a MailMsgInfo type for the virtual function table.
	- Record the size of message sub-types in MailMsgInfo.
	- New/changed functions:
	    mail_msg_new()   - Easier to use.
	    mail_msg_ref()   - Increase reference count.
	    mail_msg_unref() - Decrease reference count.
	    mail_msg_main_loop_push()    }
	    mail_msg_unordered_push()    } Submit MailMsgs to various
	    mail_msg_fast_ordered_push() } message-processing threads.
	    mail_msg_slow_ordered_push() }

	* mail/mail-mt.c (mail_msg_new):
	Use GSlice for memory allocation.

	* mail/mail-mt.c (mail_msg_ref), (mail_msg_unref):
	New functions increment/decrement a MailMsg's reference count.

	* mail/mail-mt.c (mail_cancel_hood_add), (mail_cancel_hook_remove):
	Convert the 'cancel_hook_list' from an  EDList to a GHookList and
	modify the API accordingly.

	* mail/mail-mt.c:
	Use GThreadPools instead of EThreads.
	Use GAsyncQueues instead of EMsgPorts.

	* mail/em-composer-utils.c:
	* mail/em-folder-browser.c:
	* mail/em-folder-properties.c:
	* mail/em-folder-tree.c:
	* mail/em-folder-utils.c:
	* mail/em-folder-view.c:
	* mail/em-format-html-print.c:
	* mail/em-format-html.c:
	* mail/em-subscribe-editor.c:
	* mail/em-sync-stream.c:
	* mail/importers/elm-importer.c:
	* mail/importers/mail-importer.c:
	* mail/importers/pine-importer.c:
	* mail/mail-component.c:
	* mail/mail-folder-cache.c:
	* mail/mail-mt.c:
	* mail/mail-ops.c:
	* mail/mail-ops.h:
	* mail/mail-send-recv.c:
	* mail/mail-session.c:
	* mail/mail-vfolder.c:
	* mail/message-list.c:
	* plugins/folder-unsubscribe/folder-unsubscribe.c:
	* plugins/groupwise-features/share-folder-common.c:
	* plugins/exchange-operations/exchange-folder.c:
	* plugins/mark-all-read/mark-all-read.c:
	* plugins/mailing-list-actions/mailing-list-actions.c:
	* plugins/itip-formatter/itip-formatter.c:
	* plugins/save-attachments/save-attachments.c:
	Use the new MailMsg API for messages.


svn path=/trunk/; revision=34730

1 files changed, 15 insertions, 18 deletions

diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 8d9b7a2fc9..5bd4bf5cf6 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -808,15 +808,14 @@ update_folders(CamelStore *store, CamelFolderInfo *fi, void *data)
 
 
 struct _ping_store_msg {
-	struct _mail_msg msg;
+	MailMsg base;
 
 	CamelStore *store;
 };
 
-static char *
-ping_store_desc (struct _mail_msg *mm, int done)
+static gchar *
+ping_store_desc (struct _ping_store_msg *m)
 {
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
 	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
 	char *msg;
 
@@ -827,10 +826,9 @@ ping_store_desc (struct _mail_msg *mm, int done)
 }
 
 static void
-ping_store_ping (struct _mail_msg *mm)
+ping_store_exec (struct _ping_store_msg *m)
 {
 	gboolean online = FALSE;
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
 
 	if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) {
 		if (CAMEL_IS_DISCO_STORE (m->store) &&
@@ -841,22 +839,21 @@ ping_store_ping (struct _mail_msg *mm)
 			online = TRUE;
 	}
 	if (online)
-		camel_store_noop (m->store, &mm->ex);
+		camel_store_noop (m->store, &m->base.ex);
 }
 
 static void
-ping_store_free (struct _mail_msg *mm)
+ping_store_free (struct _ping_store_msg *m)
 {
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
-
 	camel_object_unref (m->store);
 }
 
-static struct _mail_msg_op ping_store_op = {
-	ping_store_desc,
-	ping_store_ping,
-	NULL,
-	ping_store_free
+static MailMsgInfo ping_store_info = {
+	sizeof (struct _ping_store_msg),
+	(MailMsgDescFunc) ping_store_desc,
+	(MailMsgExecFunc) ping_store_exec,
+	(MailMsgDoneFunc) NULL,
+	(MailMsgFreeFunc) ping_store_free
 };
 
 static void
@@ -868,11 +865,11 @@ ping_store (gpointer key, gpointer val, gpointer user_data)
 	if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED)
 		return;
 
-	m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg));
+	m = mail_msg_new (&ping_store_info);
 	m->store = store;
 	camel_object_ref (store);
 
-	e_thread_put (mail_thread_queued_slow, (EMsg *) m);
+	mail_msg_slow_ordered_push (m);
 }
 
 static gboolean
@@ -917,7 +914,7 @@ mail_note_store(CamelStore *store, CamelOperation *op,
 	int hook = 0;
 
 	g_return_if_fail (CAMEL_IS_STORE(store));
-	g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread));
+	g_return_if_fail (mail_in_main_thread());
 
 	LOCK(info_lock);