diff --git a/.cvsignore b/.cvsignore index 84ae6c1..583e3b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.12.1.tar.bz2 +evolution-2.21.1.tar.bz2 diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 4b18c38..ee76394 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,1197 +1,103 @@ ---- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400 -+++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-09-04 00:19:08.000000000 -0400 -@@ -44,32 +44,30 @@ +diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/mail/mail-send-recv.c +--- evolution-2.21.1/mail/mail-send-recv.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-send-recv.c 2007-10-29 14:47:20.000000000 -0400 +@@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d, + /* ********************************************************************** */ - - struct _folder_unsub_t { + struct _refresh_folders_msg { - struct _mail_msg msg; + MailMsg base; - - char *uri; - }; --static char * --folder_unsubscribe__desc (struct _mail_msg *mm, int done) -+static gchar * -+folder_unsubscribe_desc (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); -+ return g_strdup_printf ( -+ _("Unsubscribing from folder \"%s\""), msg->uri); - } - - static void --folder_unsubscribe__unsub (struct _mail_msg *mm) -+folder_unsubscribe_exec (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; - extern CamelSession *session; - const char *path = NULL; + struct _send_info *info; + GPtrArray *folders; CamelStore *store; - CamelURL *url; - -- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) -+ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) - return; - -- url = camel_url_new (unsub->uri, NULL); -+ url = camel_url_new (msg->uri, NULL); - if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) - path = url->fragment; - else if (url->path && url->path[0]) -@@ -82,18 +80,17 @@ - } - - static void --folder_unsubscribe__free (struct _mail_msg *mm) -+folder_unsubscribe_free (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- g_free (unsub->uri); -+ g_free (msg->uri); - } - --static struct _mail_msg_op unsubscribe_op = { -- folder_unsubscribe__desc, -- folder_unsubscribe__unsub, -- NULL, -- folder_unsubscribe__free, -+static MailMsgInfo unsubscribe_info = { -+ sizeof (struct _folder_unsub_t), -+ (MailMsgDescFunc) folder_unsubscribe_desc, -+ (MailMsgExecFunc) folder_unsubscribe_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) folder_unsubscribe_free - }; - - -@@ -105,8 +102,8 @@ - if (target->uri == NULL) - return; - -- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); -+ unsub = mail_msg_new (&unsubscribe_info); - unsub->uri = g_strdup (target->uri); - -- e_thread_put (mail_thread_new, (EMsg *) unsub); -+ mail_msg_unordered_push (unsub); - } ---- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-09-02 14:56:39.000000000 -0400 -+++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c 2007-09-04 00:19:08.000000000 -0400 -@@ -44,7 +44,7 @@ - return; - } - -- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); -+ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); - } - - static void ---- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread 2007-09-02 14:56:45.000000000 -0400 -+++ evolution-2.11.92/plugins/save-attachments/save-attachments.c 2007-09-04 00:19:08.000000000 -0400 -@@ -403,5 +403,5 @@ - camel_object_ref(data->folder); - data->uid = g_strdup(target->uids->pdata[0]); - -- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); -+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); - } ---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400 -+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c 2007-09-04 00:19:08.000000000 -0400 -@@ -121,7 +121,7 @@ - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -137,31 +137,26 @@ - void *user_data; - }; - --static char * --create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+create_folder_desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - - static void --create_folder__create (struct _mail_msg *mm) -+create_folder_exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); - } - } - - static void --create_folder__created (struct _mail_msg *mm) -+create_folder_done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; - struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; - CamelStore *store = CAMEL_STORE (m->store) ; - EGwConnection *ccnc; -@@ -180,10 +175,8 @@ - } - - static void --create_folder__free (struct _mail_msg *mm) -+create_folder_free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -191,11 +184,12 @@ - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- create_folder__desc, -- create_folder__create, -- create_folder__created, -- create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) create_folder_desc, -+ (MailMsgExecFunc) create_folder_exec, -+ (MailMsgDoneFunc) create_folder_done, -+ (MailMsgFreeFunc) create_folder_free - }; - - static void -@@ -229,7 +223,7 @@ - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ - m->user_data = (struct ShareInfo *) user_data; - m->done = done; - g_free (namebuf); -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } ---- evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 -+++ evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c 2007-09-04 00:19:08.000000000 -0400 -@@ -89,7 +89,7 @@ - data->uri = strdup (sel->uri); - - mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), -- emla_list_action_do, data, mail_thread_new); -+ emla_list_action_do, data, mail_msg_unordered_push); - } - - void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-09-02 14:56:39.000000000 -0400 -+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c 2007-09-04 00:19:08.000000000 -0400 -@@ -140,7 +140,7 @@ - inbox_physical_uri = e_folder_get_physical_uri (inbox); - - /* To get the CamelStore/Folder */ -- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); -+ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - - } ---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-09-02 14:57:09.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c 2007-09-04 00:19:08.000000000 -0400 -@@ -45,10 +45,6 @@ - GMutex *mutex; - }; - --EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ --EMsgPort *alarm_reply_port; --static GIOChannel *alarm_reply_channel; -- - #define d(x) x - - -@@ -286,72 +282,12 @@ - g_mutex_free (priv->mutex); - g_free (priv); - -- e_thread_destroy(alarm_operation_thread); -- g_io_channel_unref(alarm_reply_channel); -- e_msgport_destroy(alarm_reply_port); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); - } - - - --static guint --alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) --{ -- GSource *source; -- guint id; -- -- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -- -- return id; --} -- --static void --alarm_msg_destroy(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- /* Free the private */ -- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ -- g_free (m); --} -- --static gboolean --alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) --{ -- EMsgPort *port = (EMsgPort *)d; -- EMsg *m; -- -- while (( m = e_msgport_get(port))) { -- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); -- alarm_msg_destroy(NULL, m, NULL); -- } -- -- return TRUE; --} -- --static void --alarm_msg_received(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); -- if (m->receive_msg) { -- m->receive_msg (e, m, data); -- } --} -- - /** - * alarm_notify_new: - * -@@ -363,23 +299,10 @@ - AlarmNotify * - alarm_notify_new (void) - { -- AlarmNotify *an; -- -- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); -- -- /* Create a thread for alarm queue operation*/ -- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); -- -- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, 0); -- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, 0); -- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); -- -- an = g_object_new (TYPE_ALARM_NOTIFY, -- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), -- NULL); -- -- return an; -+ return g_object_new (TYPE_ALARM_NOTIFY, -+ "poa", bonobo_poa_get_threaded ( -+ ORBIT_THREAD_HINT_PER_REQUEST, NULL), -+ NULL); - } - - static void ---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-09-02 14:57:09.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h 2007-09-04 00:19:08.000000000 -0400 -@@ -39,19 +39,6 @@ - - typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - --typedef struct _AlarmMsg AlarmMsg; --typedef struct _AlarmMsgPrivate AlarmMsgPrivate; -- --struct _AlarmMsg { -- EMsg msg; -- -- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ -- void *data; -- -- /* Private Usage */ -- struct _AlarmMsgPrivate *priv; --}; -- - struct _AlarmNotify { - BonoboObject object; - ---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-09-02 14:57:09.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c 2007-09-04 00:19:08.000000000 -0400 -@@ -97,9 +97,6 @@ - static int tray_blink_state = FALSE; - static AlarmNotify *an; - --/* Main Tasks thread for dealing with the global structures */ --extern EThread *alarm_operation_thread; -- - /* Structure that stores a client we are monitoring */ - typedef struct { - /* Monitored client */ -@@ -181,6 +178,40 @@ - static void load_alarms_for_today (ClientAlarms *ca); - static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - -+/* Simple asynchronous message dispatcher */ -+ -+typedef struct _Message Message; -+typedef void (*MessageFunc) (Message *msg); -+ -+struct _Message { -+ MessageFunc func; -+}; -+ -+static void -+message_proxy (Message *msg) -+{ -+ g_return_if_fail (msg->func != NULL); -+ -+ msg->func (msg); -+} -+ -+static gpointer -+create_thread_pool (void) -+{ -+ /* once created, run forever */ -+ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); -+} -+ -+static void -+message_push (Message *msg) -+{ -+ static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, NULL); -+ -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} -+ - /* Queues an alarm trigger for midnight so that we can load the next day's worth - * of alarms. - */ -@@ -219,47 +250,41 @@ - } - - struct _midnight_refresh_msg { -+ Message header; - gboolean remove; - }; - - /* Loads the alarms for the new day every midnight */ - static void --midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) -+midnight_refresh_async (struct _midnight_refresh_msg *msg) - { -- struct _midnight_refresh_msg *list = msg->data; -- - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - - /* Re-load the alarms for all clients */ - g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - - /* Re-schedule the midnight update */ -- if (list->remove && midnight_refresh_id != NULL) { -+ if (msg->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); - alarm_remove (midnight_refresh_id); - midnight_refresh_id = NULL; - } - - queue_midnight_refresh (); -+ -+ g_slice_free (struct _midnight_refresh_msg, msg); - } - - static void - midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) - { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = TRUE; -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = TRUE; - -- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Looks up a client in the client alarms hash table */ -@@ -657,6 +682,7 @@ - * alarms. - */ - struct _query_msg { -+ Message header; - ECal *client; - GList *objects; - gpointer data; -@@ -690,7 +716,7 @@ - } - - static void --query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_changed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - time_t from, day_end; -@@ -699,13 +725,12 @@ - icaltimezone *zone; - CompQueuedAlarms *cqa; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - from = config_data_get_last_notification_time (); - if (from == -1) -@@ -799,43 +824,38 @@ - comp = NULL; - } - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_changed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_changed_async; -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ical (objects); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_changed_async; -+ msg->client = client; -+ msg->objects = duplicate_ical (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - /* Called when a calendar component is removed; we must delete its corresponding - * alarms. - */ - static void --query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_removed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - -@@ -848,27 +868,22 @@ - } - - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ecal (objects); -- list->data = data; -- msg->data = list; -+ struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_removed_async; -+ msg->client = client; -+ msg->objects = duplicate_ecal (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - -@@ -1010,20 +1025,19 @@ - } - - static void --on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) -+on_dialog_objs_removed_async (struct _query_msg *msg) - { - const char *our_uid; - GList *l; - TrayIconData *tray_data; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - - d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - -- client = list->client; -- tray_data = list->data; -- objects = list->objects; -+ client = msg->client; -+ tray_data = msg->data; -+ objects = msg->objects; - - e_cal_component_get_uid (tray_data->comp, &our_uid); - g_return_if_fail (our_uid && *our_uid); -@@ -1041,37 +1055,33 @@ - tray_data = NULL; - } - } -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = on_dialog_objs_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = objects; -- list->data = data; -- msg->data = list; -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; -+ msg->client = client; -+ msg->objects = objects; -+ msg->data = data; - -- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - struct _tray_cqa_msg { -+ Message header; - CompQueuedAlarms *cqa; - }; - - static void --tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) - { -- struct _tray_cqa_msg *tmsg = msg->data; -- CompQueuedAlarms *cqa = tmsg->cqa; -+ CompQueuedAlarms *cqa = msg->cqa; - GList *list = tray_icons_list; - - d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1110,28 +1120,25 @@ - gtk_tree_selection_select_iter (sel, &iter); - } - } -+ -+ g_slice_free (struct _tray_cqa_msg, msg); - } - - static void - tray_list_remove_cqa (CompQueuedAlarms *cqa) - { -- AlarmMsg *msg; -- struct _tray_cqa_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_cqa_async; -- -- list = malloc (sizeof (struct _tray_cqa_msg)); -- list->cqa = cqa; -- msg->data = list; -+ struct _tray_cqa_msg *msg; -+ -+ msg = g_slice_new (struct _tray_cqa_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; -+ msg->cqa = cqa; - -- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Callback used from the alarm notify dialog */ - static void --tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_async (Message *msg) - { - GList *list = tray_icons_list; - -@@ -1161,55 +1168,50 @@ - } else - list = list->next; - } -+ -+ g_slice_free (Message, msg); - } - - static void --tray_list_remove_icons () -+tray_list_remove_icons (void) - { -- AlarmMsg *msg; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; -+ msg = g_slice_new (Message); -+ msg->func = tray_list_remove_async; - -- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push (msg); - } - - struct _tray_msg { -+ Message header; - TrayIconData *data; - }; - - static void --tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_data_async (struct _tray_msg *msg) - { -- struct _tray_msg *tmsg = msg->data; -- TrayIconData *tray_data = tmsg->data; -+ TrayIconData *tray_data = msg->data; - - d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - - tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); - free_tray_icon_data (tray_data); - tray_data = NULL; -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_remove_data (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_data_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -+ struct _tray_msg *msg; -+ -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - static void -@@ -1416,29 +1418,24 @@ - /* Add a new data to tray list */ - - static void --tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) -+tray_list_add_async (struct _tray_msg *msg) - { -- struct _tray_msg *list = msg->data; -- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); -- tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); -+ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_add_new (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -+ struct _tray_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_add_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_add_async; -+ msg->data = data; -+ -+ message_push ((Message *) msg); - } - - /* Performs notification of a display alarm */ -@@ -1835,21 +1832,13 @@ - new_midnight = time_day_end_with_zone (time (NULL), zone); - - if (new_midnight > midnight) { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = FALSE; -- /* We dont need it. So set it to NULL */ -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = FALSE; - -- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - return TRUE; -@@ -1980,14 +1969,15 @@ - } - - struct _alarm_client_msg { -+ Message header; - ECal *client; - }; - --static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) -+static void -+alarm_queue_add_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2018,6 +2008,8 @@ - G_CALLBACK (cal_opened_cb), - ca); - } -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** -@@ -2037,20 +2029,13 @@ - void - alarm_queue_add_client (ECal *client) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_add_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- g_object_ref (client); -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_add_async; -+ msg->client = g_object_ref (client); - -- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Removes a component an its alarms */ -@@ -2102,11 +2087,10 @@ - * Removes a calendar client from the alarm queueing system. - **/ - static void --alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) -+alarm_queue_remove_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2143,6 +2127,8 @@ - g_free (ca); - - g_hash_table_remove (client_alarms_hash, client); -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** alarm_queue_remove_client -@@ -2155,24 +2141,16 @@ alarm_queue_remove_async (EThread *e, Al - void - alarm_queue_remove_client (ECal *client, gboolean immediately) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_remove_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- msg->data = list; -- -- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); -- if (immediately) { -- alarm_queue_remove_async (NULL, msg, NULL); -- g_free (list); -- g_free (msg); -- } else -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; -+ -+ if (immediately) -+ alarm_queue_remove_async (msg); -+ else -+ message_push ((Message *) msg); - } - - /* Update non-time related variables for various structures on modification of an existing component ---- evolution-2.11.92/mail/em-folder-utils.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-utils.c 2007-09-04 00:19:08.000000000 -0400 -@@ -85,7 +85,7 @@ - } - - struct _EMCopyFolders { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *fromstore; -@@ -97,18 +97,15 @@ - int delete; }; -static char * --emft_copy_folders__desc (struct _mail_msg *mm, int complete) +-refresh_folders_desc (struct _mail_msg *mm, int done) +static gchar * -+emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) ++refresh_folders_desc (struct _refresh_folders_msg *m) { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); + return g_strdup_printf(_("Checking for new mail")); } static void --emft_copy_folders__copy (struct _mail_msg *mm) -+emft_copy_folders__exec (struct _EMCopyFolders *m) +-refresh_folders_get (struct _mail_msg *mm) ++refresh_folders_exec (struct _refresh_folders_msg *m) { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; - guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - GList *pending = NULL, *deleting = NULL, *l; - GString *fromname, *toname; -@@ -116,7 +113,7 @@ - const char *tmp; - int fromlen; - -- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) -+ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) - return; - - pending = g_list_append (pending, fi); -@@ -156,8 +153,8 @@ - if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { - d(printf ("this folder is selectable\n")); - if (m->tostore == m->fromstore && m->delete) { -- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); -- if (camel_exception_is_set (&mm->ex)) -+ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - - /* this folder no longer exists, unsubscribe it */ -@@ -166,16 +163,16 @@ - - deleted = 1; - } else { -- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) -+ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) - goto exception; - -- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { -+ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { - camel_object_unref (fromfolder); - goto exception; - } - - uids = camel_folder_get_uids (fromfolder); -- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); -+ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); - camel_folder_free_uids (fromfolder, uids); - - if (m->delete) -@@ -186,7 +183,7 @@ - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - else if (m->delete && !deleted) - deleting = g_list_prepend (deleting, info); -@@ -227,10 +224,8 @@ +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + CamelFolder *folder; + CamelException ex = CAMEL_EXCEPTION_INITIALISER; +@@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m } static void --emft_copy_folders__free (struct _mail_msg *mm) -+emft_copy_folders__free (struct _EMCopyFolders *m) +-refresh_folders_got (struct _mail_msg *mm) ++refresh_folders_done (struct _refresh_folders_msg *m) { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - camel_object_unref (m->fromstore); - camel_object_unref (m->tostore); - -@@ -238,11 +233,12 @@ - g_free (m->tobase); +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; +- + receive_done("", m->info); } --static struct _mail_msg_op copy_folders_op = { -- emft_copy_folders__desc, -- emft_copy_folders__copy, -- NULL, -- emft_copy_folders__free, -+static MailMsgInfo copy_folders_info = { -+ sizeof (struct _EMCopyFolders), -+ (MailMsgDescFunc) emft_copy_folders__desc, -+ (MailMsgExecFunc) emft_copy_folders__exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) emft_copy_folders__free + static void +-refresh_folders_free (struct _mail_msg *mm) ++refresh_folders_free (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + + for (i=0;ifolders->len;i++) +@@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg * + camel_object_unref(m->store); + } + +-static struct _mail_msg_op refresh_folders_op = { +- refresh_folders_desc, +- refresh_folders_get, +- refresh_folders_got, +- refresh_folders_free, ++static MailMsgInfo refresh_folders_info = { ++ sizeof (struct _refresh_folders_msg), ++ (MailMsgDescFunc) refresh_folders_desc, ++ (MailMsgExecFunc) refresh_folders_exec, ++ (MailMsgDoneFunc) refresh_folders_done, ++ (MailMsgFreeFunc) refresh_folders_free }; - int -@@ -251,7 +247,7 @@ - struct _EMCopyFolders *m; - int seq; - -- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); -+ m = mail_msg_new (©_folders_info); - camel_object_ref (fromstore); - m->fromstore = fromstore; - camel_object_ref (tostore); -@@ -259,9 +255,9 @@ - m->frombase = g_strdup (frombase); - m->tobase = g_strdup (tobase); - m->delete = delete; -- seq = m->msg.seq; -+ seq = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - - return seq; - } -@@ -558,7 +554,7 @@ - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -582,41 +578,33 @@ - char *uri; - }; - --static char * --emfu_create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+emfu_create_folder__desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - static void --emfu_create_folder__create (struct _mail_msg *mm) -+emfu_create_folder__exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); +@@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore + + get_folders(store, folders, info); + +- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&refresh_folders_info); + m->store = store; + camel_object_ref(store); + m->folders = folders; + m->info = sinfo; + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); + } else { + receive_done ("", data); } - } +diff -up evolution-2.21.1/mail/mail-component.c.kill-ethread evolution-2.21.1/mail/mail-component.c +--- evolution-2.21.1/mail/mail-component.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-component.c 2007-10-29 14:47:20.000000000 -0400 +@@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s + if (camel_url_get_param(url, "uid") != NULL) { + char *curi = em_uri_to_camel(uri); - static void --emfu_create_folder__created (struct _mail_msg *mm) -+emfu_create_folder__done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - if (m->done) - m->done (m->fi, m->user_data); - } - - static void --emfu_create_folder__free (struct _mail_msg *mm) -+emfu_create_folder__free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -624,11 +612,12 @@ - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- emfu_create_folder__desc, -- emfu_create_folder__create, -- emfu_create_folder__created, -- emfu_create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) emfu_create_folder__desc, -+ (MailMsgExecFunc) emfu_create_folder__exec, -+ (MailMsgDoneFunc) emfu_create_folder__done, -+ (MailMsgFreeFunc) emfu_create_folder__free - }; - - -@@ -649,7 +638,7 @@ - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -660,8 +649,8 @@ - - g_free (namebuf); - -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } ---- evolution-2.11.92/mail/mail-ops.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-ops.c 2007-09-04 00:19:08.000000000 -0400 +- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); ++ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); + g_free(curi); + } else { + g_warning("email uri's must include a uid parameter"); +diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mail-ops.c +--- evolution-2.21.1/mail/mail-ops.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-ops.c 2007-10-29 14:54:45.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -1201,7 +107,7 @@ CamelFolder *source_folder; /* where they come from */ GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ -@@ -99,8 +99,8 @@ +@@ -99,8 +99,8 @@ struct _fetch_mail_msg { void *data; }; @@ -1212,7 +118,7 @@ { return g_strdup (_("Filtering Selected Messages")); } -@@ -108,9 +108,8 @@ +@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc /* filter a folder, or a subset thereof, uses source_folder/source_uids */ /* this is shared with fetch_mail */ static void @@ -1223,7 +129,7 @@ CamelFolder *folder; GPtrArray *uids, *folder_uids = NULL; -@@ -137,15 +136,15 @@ +@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct else folder_uids = uids = camel_folder_get_uids (folder); @@ -1242,7 +148,7 @@ camel_folder_thaw (folder); if (m->destination) -@@ -161,15 +160,13 @@ +@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct } static void @@ -1260,7 +166,7 @@ if (m->source_folder) camel_object_unref (m->source_folder); -@@ -188,11 +185,12 @@ +@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m mail_session_flush_filter_log (); } @@ -1278,7 +184,7 @@ }; void -@@ -202,7 +200,7 @@ +@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ { struct _filter_mail_msg *m; @@ -1287,7 +193,7 @@ m->source_folder = source_folder; camel_object_ref (source_folder); m->source_uids = uids; -@@ -221,7 +219,7 @@ +@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -1296,7 +202,7 @@ } /* convenience functions for it */ -@@ -260,17 +258,16 @@ +@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) return filename; } @@ -1318,7 +224,7 @@ int i; if (m->cancel) -@@ -283,20 +280,20 @@ +@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) /* FIXME: this should support keep_on_server too, which would then perform a spool access thingy, right? problem is matching raw messages to uid's etc. */ if (!strncmp (m->source_uri, "mbox:", 5)) { @@ -1344,12 +250,12 @@ if (folder) { /* this handles 'keep on server' stuff, if we have any new uid's to copy -@@ -322,17 +319,17 @@ +@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_free_uids (cache_uids); fm->cache = cache; - em_filter_folder_element_filter (mm); -+ em_filter_folder_element_exec (&fm->base); ++ em_filter_folder_element_exec (fm); /* need to uncancel so writes/etc. don't fail */ - if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) @@ -1365,16 +271,16 @@ /* not keep on server - just delete all the actual messages on the server */ for (i=0;ilen;i++) { d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); -@@ -348,7 +345,7 @@ +@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_destroy (cache); camel_folder_free_uids (folder, folder_uids); } else { - em_filter_folder_element_filter (mm); -+ em_filter_folder_element_exec (&fm->base); ++ em_filter_folder_element_exec (fm); } /* we unref the source folder here since we -@@ -372,31 +369,28 @@ +@@ -372,31 +369,28 @@ fail: } static void @@ -1398,7 +304,7 @@ camel_operation_unref (m->cancel); - em_filter_folder_element_free (mm); -+ em_filter_folder_element_free (&m->fmsg.base); ++ em_filter_folder_element_free ((struct _filter_mail_msg *) m); } -static struct _mail_msg_op fetch_mail_op = { @@ -1415,7 +321,7 @@ }; /* ouch, a 'do everything' interface ... */ -@@ -409,7 +403,7 @@ +@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -1424,7 +330,7 @@ fm = (struct _filter_mail_msg *)m; m->source_uri = g_strdup (source); fm->delete = !keep; -@@ -426,7 +420,7 @@ +@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); @@ -1433,7 +339,7 @@ } /* ********************************************************************** */ -@@ -657,7 +651,7 @@ +@@ -657,7 +651,7 @@ exit: /* ** SEND MAIL QUEUE ***************************************************** */ struct _send_queue_msg { @@ -1442,7 +348,7 @@ CamelFolder *queue; char *destination; -@@ -689,9 +683,8 @@ +@@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m } static void @@ -1453,7 +359,7 @@ CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); GPtrArray *uids, *send_uids = NULL; CamelException ex; -@@ -739,17 +732,17 @@ +@@ -739,17 +732,17 @@ send_queue_send(struct _mail_msg *mm) if (camel_exception_is_set (&ex)) { if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ @@ -1475,7 +381,7 @@ break; } } -@@ -759,7 +752,7 @@ +@@ -759,7 +752,7 @@ send_queue_send(struct _mail_msg *mm) if (j > 0) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); @@ -1484,7 +390,7 @@ report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); else report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); -@@ -785,19 +778,15 @@ +@@ -785,19 +778,15 @@ send_queue_send(struct _mail_msg *mm) } static void @@ -1506,7 +412,7 @@ if (m->driver) camel_object_unref(m->driver); camel_object_unref(m->queue); -@@ -806,11 +795,12 @@ +@@ -806,11 +795,12 @@ send_queue_free(struct _mail_msg *mm) camel_operation_unref(m->cancel); } @@ -1524,7 +430,7 @@ }; /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ -@@ -823,7 +813,7 @@ +@@ -823,7 +813,7 @@ mail_send_queue(CamelFolder *queue, cons { struct _send_queue_msg *m; @@ -1533,7 +439,7 @@ m->queue = queue; camel_object_ref(queue); m->destination = g_strdup(destination); -@@ -839,13 +829,13 @@ +@@ -839,13 +829,13 @@ mail_send_queue(CamelFolder *queue, cons m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); @@ -1549,7 +455,7 @@ CamelFolder *folder; CamelMimeMessage *message; -@@ -856,45 +846,40 @@ +@@ -856,45 +846,40 @@ struct _append_msg { void *data; }; @@ -1608,7 +514,7 @@ }; void -@@ -911,7 +896,7 @@ +@@ -911,7 +896,7 @@ mail_append_mail (CamelFolder *folder, C camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); @@ -1617,7 +523,7 @@ m->folder = folder; camel_object_ref(folder); m->message = message; -@@ -921,13 +906,13 @@ +@@ -921,13 +906,13 @@ mail_append_mail (CamelFolder *folder, C m->done = done; m->data = data; @@ -1633,7 +539,7 @@ CamelFolder *source; GPtrArray *uids; -@@ -939,24 +924,21 @@ +@@ -939,24 +924,21 @@ struct _transfer_msg { void *data; }; @@ -1663,7 +569,7 @@ return; if (dest == m->source) { -@@ -968,7 +950,7 @@ +@@ -968,7 +950,7 @@ transfer_messages_transfer (struct _mail camel_folder_freeze (m->source); camel_folder_freeze (dest); @@ -1672,7 +578,7 @@ /* make sure all deleted messages are marked as seen */ -@@ -987,29 +969,26 @@ +@@ -987,29 +969,26 @@ transfer_messages_transfer (struct _mail } static void @@ -1711,7 +617,7 @@ }; void -@@ -1026,7 +1005,7 @@ +@@ -1026,7 +1005,7 @@ mail_transfer_messages (CamelFolder *sou g_return_if_fail (uids != NULL); g_return_if_fail (dest_uri != NULL); @@ -1720,7 +626,7 @@ m->source = source; camel_object_ref (source); m->uids = uids; -@@ -1036,13 +1015,13 @@ +@@ -1036,13 +1015,13 @@ mail_transfer_messages (CamelFolder *sou m->done = done; m->data = data; @@ -1736,7 +642,7 @@ CamelStore *store; CamelFolderInfo *info; -@@ -1050,10 +1029,9 @@ +@@ -1050,10 +1029,9 @@ struct _get_folderinfo_msg { void *data; }; @@ -1749,7 +655,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1063,25 +1041,22 @@ +@@ -1063,25 +1041,22 @@ get_folderinfo_desc (struct _mail_msg *m } static void @@ -1780,7 +686,7 @@ g_free (url); } -@@ -1090,20 +1065,19 @@ +@@ -1090,20 +1065,19 @@ get_folderinfo_got (struct _mail_msg *mm } static void @@ -1808,7 +714,7 @@ }; int -@@ -1112,19 +1086,19 @@ +@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, struct _get_folderinfo_msg *m; int id; @@ -1833,7 +739,7 @@ return id; } -@@ -1196,7 +1170,7 @@ +@@ -1196,7 +1170,7 @@ mail_build_attachment(CamelFolder *folde presumably create a folder ... */ struct _get_folder_msg { @@ -1842,7 +748,7 @@ char *uri; guint32 flags; -@@ -1205,71 +1179,64 @@ +@@ -1205,71 +1179,64 @@ struct _get_folder_msg { void *data; }; @@ -1931,7 +837,7 @@ char *uri; CamelStore *store; -@@ -1277,50 +1244,43 @@ +@@ -1277,50 +1244,43 @@ struct _get_store_msg { void *data; }; @@ -1994,7 +900,7 @@ }; int -@@ -1329,25 +1289,25 @@ +@@ -1329,25 +1289,25 @@ mail_get_store (const char *uri, CamelOp struct _get_store_msg *m; int id; @@ -2026,7 +932,7 @@ char *uri; gboolean removed; -@@ -1355,18 +1315,15 @@ +@@ -1355,18 +1315,15 @@ struct _remove_folder_msg { void *data; }; @@ -2048,7 +954,7 @@ CamelStore *store; CamelFolder *folder; GPtrArray *uids; -@@ -1374,7 +1331,7 @@ +@@ -1374,7 +1331,7 @@ remove_folder_get (struct _mail_msg *mm) m->removed = FALSE; @@ -2057,7 +963,7 @@ if (!folder) return; -@@ -1394,16 +1351,14 @@ +@@ -1394,16 +1351,14 @@ remove_folder_get (struct _mail_msg *mm) camel_store_unsubscribe_folder (store, folder->full_name, NULL); /* Then delete the folder from the store */ @@ -2077,7 +983,7 @@ if (m->removed) { /* FIXME: Remove this folder from the folder cache ??? */ } -@@ -1413,18 +1368,17 @@ +@@ -1413,18 +1368,17 @@ remove_folder_got (struct _mail_msg *mm) } static void @@ -2103,7 +1009,7 @@ }; void -@@ -1432,59 +1386,56 @@ +@@ -1432,59 +1386,56 @@ mail_remove_folder (const char *uri, voi { struct _remove_folder_msg *m; @@ -2181,7 +1087,7 @@ }; void -@@ -1492,19 +1443,19 @@ +@@ -1492,19 +1443,19 @@ mail_sync_folder(CamelFolder *folder, vo { struct _sync_folder_msg *m; @@ -2204,7 +1110,7 @@ CamelStore *store; int expunge; -@@ -1512,9 +1463,9 @@ +@@ -1512,9 +1463,9 @@ struct _sync_store_msg { void *data; }; @@ -2216,7 +1122,7 @@ char *uri, *res; uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); -@@ -1527,33 +1478,31 @@ +@@ -1527,33 +1478,31 @@ static char *sync_store_desc(struct _mai return res; } @@ -2263,7 +1169,7 @@ }; void -@@ -1561,36 +1510,37 @@ +@@ -1561,36 +1510,37 @@ mail_sync_store(CamelStore *store, int e { struct _sync_store_msg *m; @@ -2313,7 +1219,7 @@ }; void -@@ -1598,35 +1548,36 @@ +@@ -1598,35 +1548,36 @@ mail_refresh_folder(CamelFolder *folder, { struct _sync_folder_msg *m; @@ -2362,7 +1268,7 @@ }; void -@@ -1634,31 +1585,30 @@ +@@ -1634,31 +1585,30 @@ mail_expunge_folder(CamelFolder *folder, { struct _sync_folder_msg *m; @@ -2399,7 +1305,7 @@ return g_strdup_printf (_("Emptying trash in \'%s\'"), m->account ? m->account->name : _("Local Folders")); #else -@@ -1666,49 +1616,48 @@ +@@ -1666,49 +1616,48 @@ static char *empty_trash_desc(struct _ma #endif } @@ -2464,7 +1370,7 @@ }; void -@@ -1716,20 +1665,20 @@ +@@ -1716,20 +1665,20 @@ mail_empty_trash(EAccount *account, void { struct _empty_trash_msg *m; @@ -2488,7 +1394,7 @@ CamelFolder *folder; char *uid; -@@ -1739,32 +1688,28 @@ +@@ -1739,32 +1688,28 @@ struct _get_message_msg { CamelOperation *cancel; }; @@ -2530,7 +1436,7 @@ g_free (m->uid); camel_object_unref (m->folder); camel_operation_unref (m->cancel); -@@ -1773,21 +1718,22 @@ +@@ -1773,21 +1718,22 @@ static void get_message_free(struct _mai camel_object_unref (m->message); } @@ -2560,7 +1466,7 @@ m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1795,37 +1741,37 @@ +@@ -1795,37 +1741,37 @@ mail_get_message(CamelFolder *folder, co m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -2610,7 +1516,7 @@ m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1833,13 +1779,13 @@ +@@ -1833,13 +1779,13 @@ mail_get_messagex(CamelFolder *folder, c m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -2626,7 +1532,7 @@ CamelFolder *folder; GPtrArray *uids; -@@ -1849,26 +1795,25 @@ +@@ -1849,26 +1795,25 @@ struct _get_messages_msg { void *data; }; @@ -2659,7 +1565,7 @@ if (message == NULL) break; -@@ -1876,17 +1821,16 @@ +@@ -1876,17 +1821,16 @@ static void get_messages_get(struct _mai } } @@ -2681,7 +1587,7 @@ int i; em_utils_uids_free (m->uids); -@@ -1898,11 +1842,12 @@ +@@ -1898,11 +1842,12 @@ static void get_messages_free(struct _ma camel_object_unref(m->folder); } @@ -2699,7 +1605,7 @@ }; void -@@ -1912,7 +1857,7 @@ +@@ -1912,7 +1857,7 @@ mail_get_messages(CamelFolder *folder, G { struct _get_messages_msg *m; @@ -2708,7 +1614,7 @@ m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -1920,13 +1865,13 @@ +@@ -1920,13 +1865,13 @@ mail_get_messages(CamelFolder *folder, G m->data = data; m->done = done; @@ -2724,7 +1630,7 @@ CamelFolder *folder; GPtrArray *uids; -@@ -1935,10 +1880,9 @@ +@@ -1935,10 +1880,9 @@ struct _save_messages_msg { void *data; }; @@ -2737,7 +1643,7 @@ return g_strdup_printf(ngettext("Saving %d message", "Saving %d messsages", m->uids->len), m->uids->len); -@@ -1977,9 +1921,8 @@ +@@ -1977,9 +1921,8 @@ save_prepare_part (CamelMimePart *mime_p } static void @@ -2748,7 +1654,7 @@ CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; CamelStream *stream; -@@ -1996,8 +1939,8 @@ +@@ -1996,8 +1939,8 @@ save_messages_save (struct _mail_msg *mm CamelMimeMessage *message; int pc = ((i+1) * 100) / m->uids->len; @@ -2759,7 +1665,7 @@ if (message == NULL) break; -@@ -2009,7 +1952,7 @@ +@@ -2009,7 +1952,7 @@ save_messages_save (struct _mail_msg *mm || camel_stream_flush(stream) == -1 || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 || camel_stream_flush((CamelStream *)filtered_stream) == -1) { @@ -2768,7 +1674,7 @@ _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); g_free(from); camel_object_unref((CamelObject *)message); -@@ -2023,28 +1966,27 @@ +@@ -2023,28 +1966,27 @@ save_messages_save (struct _mail_msg *mm camel_object_unref(stream); } @@ -2807,7 +1713,7 @@ }; int -@@ -2054,7 +1996,7 @@ +@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, struct _save_messages_msg *m; int id; @@ -2816,7 +1722,7 @@ m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -2062,8 +2004,8 @@ +@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, m->data = data; m->done = done; @@ -2827,7 +1733,7 @@ return id; } -@@ -2071,7 +2013,7 @@ +@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, /* ** SAVE PART ******************************************************* */ struct _save_part_msg { @@ -2836,7 +1742,7 @@ CamelMimePart *part; char *path; -@@ -2080,27 +2022,27 @@ +@@ -2080,27 +2022,27 @@ struct _save_part_msg { gboolean readonly; }; @@ -2869,7 +1775,7 @@ _("Cannot create output file: %s:\n %s"), m->path, g_strerror (errno)); return; -@@ -2110,7 +2052,7 @@ +@@ -2110,7 +2052,7 @@ save_part_save (struct _mail_msg *mm) if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) @@ -2878,7 +1784,7 @@ _("Could not write data: %s"), g_strerror (errno)); -@@ -2118,27 +2060,25 @@ +@@ -2118,27 +2060,25 @@ save_part_save (struct _mail_msg *mm) } static void @@ -2915,7 +1821,7 @@ }; int -@@ -2147,7 +2087,7 @@ +@@ -2147,7 +2087,7 @@ mail_save_part (CamelMimePart *part, con { struct _save_part_msg *m; int id; @@ -2924,7 +1830,7 @@ m->part = part; camel_object_ref (part); m->path = g_strdup (path); -@@ -2155,8 +2095,8 @@ +@@ -2155,8 +2095,8 @@ mail_save_part (CamelMimePart *part, con m->done = done; m->readonly = readonly; @@ -2935,7 +1841,7 @@ return id; } -@@ -2165,7 +2105,7 @@ +@@ -2165,7 +2105,7 @@ mail_save_part (CamelMimePart *part, con /* ** PREPARE OFFLINE ***************************************************** */ struct _prep_offline_msg { @@ -2944,7 +1850,7 @@ CamelOperation *cancel; char *uri; -@@ -2173,22 +2113,22 @@ +@@ -2173,22 +2113,22 @@ struct _prep_offline_msg { void *data; }; @@ -2972,7 +1878,7 @@ } /* prepare_for_offline should do this? */ /* of course it should all be atomic, but ... */ -@@ -2200,28 +2140,27 @@ +@@ -2200,28 +2140,27 @@ static void prep_offline_do(struct _mail camel_operation_unregister(m->cancel); } @@ -3011,7 +1917,7 @@ }; void -@@ -2232,7 +2171,7 @@ +@@ -2232,7 +2171,7 @@ mail_prep_offline(const char *uri, { struct _prep_offline_msg *m; @@ -3020,7 +1926,7 @@ m->cancel = cancel; if (cancel) camel_operation_ref(cancel); -@@ -2240,13 +2179,13 @@ +@@ -2240,13 +2179,13 @@ mail_prep_offline(const char *uri, m->data = data; m->done = done; @@ -3036,7 +1942,7 @@ CamelStore *store; gboolean offline; -@@ -2254,9 +2193,9 @@ +@@ -2254,9 +2193,9 @@ struct _set_offline_msg { void *data; }; @@ -3048,7 +1954,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -2266,61 +2205,59 @@ +@@ -2266,61 +2205,59 @@ static char *set_offline_desc(struct _ma return msg; } @@ -3127,7 +2033,7 @@ }; int -@@ -2337,61 +2274,59 @@ +@@ -2337,61 +2274,59 @@ mail_store_set_offline (CamelStore *stor if (offline) camel_service_cancel_connect (CAMEL_SERVICE (store)); @@ -3210,7 +2116,7 @@ }; int -@@ -2404,14 +2339,14 @@ +@@ -2404,14 +2339,14 @@ mail_store_prepare_offline (CamelStore * * thread won't get queued behind a hung connect op. */ @@ -3228,7 +2134,7 @@ return id; } -@@ -2428,7 +2363,7 @@ +@@ -2428,7 +2363,7 @@ mail_execute_shell_command (CamelFilterD /* Async service-checking/authtype-lookup code. */ struct _check_msg { @@ -3237,7 +2143,7 @@ char *url; CamelProviderType type; -@@ -2438,51 +2373,47 @@ +@@ -2438,51 +2373,47 @@ struct _check_msg { void *data; }; @@ -3303,7 +2209,7 @@ }; int -@@ -2491,14 +2422,14 @@ +@@ -2491,14 +2422,14 @@ mail_check_service(const char *url, Came struct _check_msg *m; int id; @@ -3321,132 +2227,593 @@ return id; } ---- evolution-2.11.92/mail/mail-mt.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-mt.h 2007-09-04 00:19:08.000000000 -0400 -@@ -23,47 +23,64 @@ - #ifndef _MAIL_MT - #define _MAIL_MT +diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/mail/em-folder-utils.c +--- evolution-2.21.1/mail/em-folder-utils.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-folder-utils.c 2007-10-29 14:47:20.000000000 -0400 +@@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char + } --#include - #include "camel/camel-exception.h" --#include "libedataserver/e-msgport.h" - #include "camel/camel-object.h" - #include "camel/camel-operation.h" + struct _EMCopyFolders { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *fromstore; +@@ -97,18 +97,15 @@ struct _EMCopyFolders { + int delete; + }; --typedef struct _mail_msg { -- EMsg msg; /* parent type */ -- struct _mail_msg_op *ops; /* operation functions */ -+typedef struct _MailMsg MailMsg; -+typedef struct _MailMsgInfo MailMsgInfo; -+typedef struct _MailMsgPrivate MailMsgPrivate; -+ -+typedef gchar * (*MailMsgDescFunc) (MailMsg *msg); -+typedef void (*MailMsgExecFunc) (MailMsg *msg); -+typedef void (*MailMsgDoneFunc) (MailMsg *msg); -+typedef void (*MailMsgFreeFunc) (MailMsg *msg); -+typedef void (*MailMsgDispatchFunc) (gpointer msg); -+ -+struct _MailMsg { -+ MailMsgInfo *info; -+ volatile gint ref_count; - unsigned int seq; /* seq number for synchronisation */ -+ gint priority; /* priority (default = 0) */ - CamelOperation *cancel; /* a cancellation/status handle */ - CamelException ex; /* an initialised camel exception, upto the caller to use this */ -- struct _mail_msg_priv *priv; /* private for internal use */ --} mail_msg_t; -+ MailMsgPrivate *priv; -+}; +-static char * +-emft_copy_folders__desc (struct _mail_msg *mm, int complete) ++static gchar * ++emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); + } --/* callback functions for thread message */ --typedef struct _mail_msg_op { -- char *(*describe_msg)(struct _mail_msg *msg, int complete); + static void +-emft_copy_folders__copy (struct _mail_msg *mm) ++emft_copy_folders__exec (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; + guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + GList *pending = NULL, *deleting = NULL, *l; + GString *fromname, *toname; +@@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms + const char *tmp; + int fromlen; + +- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) ++ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) + return; + + pending = g_list_append (pending, fi); +@@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms + if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { + d(printf ("this folder is selectable\n")); + if (m->tostore == m->fromstore && m->delete) { +- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); +- if (camel_exception_is_set (&mm->ex)) ++ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + + /* this folder no longer exists, unsubscribe it */ +@@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms + + deleted = 1; + } else { +- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) ++ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) + goto exception; + +- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { ++ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { + camel_object_unref (fromfolder); + goto exception; + } + + uids = camel_folder_get_uids (fromfolder); +- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); ++ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); + camel_folder_free_uids (fromfolder, uids); + + if (m->delete) +@@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + else if (m->delete && !deleted) + deleting = g_list_prepend (deleting, info); +@@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms + } + + static void +-emft_copy_folders__free (struct _mail_msg *mm) ++emft_copy_folders__free (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + camel_object_unref (m->fromstore); + camel_object_unref (m->tostore); + +@@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms + g_free (m->tobase); + } + +-static struct _mail_msg_op copy_folders_op = { +- emft_copy_folders__desc, +- emft_copy_folders__copy, +- NULL, +- emft_copy_folders__free, ++static MailMsgInfo copy_folders_info = { ++ sizeof (struct _EMCopyFolders), ++ (MailMsgDescFunc) emft_copy_folders__desc, ++ (MailMsgExecFunc) emft_copy_folders__exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) emft_copy_folders__free + }; + + int +@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore + struct _EMCopyFolders *m; + int seq; + +- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); ++ m = mail_msg_new (©_folders_info); + camel_object_ref (fromstore); + m->fromstore = fromstore; + camel_object_ref (tostore); +@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore + m->frombase = g_strdup (frombase); + m->tobase = g_strdup (tobase); + m->delete = delete; +- seq = m->msg.seq; ++ seq = m->base.seq; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + + return seq; + } +@@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold + } + + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData + char *uri; + }; + +-static char * +-emfu_create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++emfu_create_folder__desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-emfu_create_folder__create (struct _mail_msg *mm) ++emfu_create_folder__exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-emfu_create_folder__created (struct _mail_msg *mm) ++emfu_create_folder__done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + if (m->done) + m->done (m->fi, m->user_data); + } + + static void +-emfu_create_folder__free (struct _mail_msg *mm) ++emfu_create_folder__free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- emfu_create_folder__desc, +- emfu_create_folder__create, +- emfu_create_folder__created, +- emfu_create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) emfu_create_folder__desc, ++ (MailMsgExecFunc) emfu_create_folder__exec, ++ (MailMsgDoneFunc) emfu_create_folder__done, ++ (MailMsgFreeFunc) emfu_create_folder__free + }; + + +@@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto + parent = namebuf; + } + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto + + g_free (namebuf); + +- id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); + + return id; + } +diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2.21.1/mail/importers/elm-importer.c +--- evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 ++++ evolution-2.21.1/mail/importers/elm-importer.c 2007-10-29 14:47:20.000000000 -0400 +@@ -51,7 +51,7 @@ + #define d(x) x + + struct _elm_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTargetHome *target; +@@ -178,8 +178,8 @@ elm_supported(EImport *ei, EImportTarget + return mailexists; + } + +-static char * +-elm_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++elm_import_desc (struct _elm_import_msg *m) + { + return g_strdup (_("Importing Elm data")); + } +@@ -190,9 +190,8 @@ static MailImporterSpecial elm_special_f + }; + + static void +-elm_import_import(struct _mail_msg *mm) ++elm_import_exec (struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; + const char *maildir; + char *elmdir; + +@@ -210,13 +209,11 @@ elm_import_import(struct _mail_msg *mm) + } + + static void +-elm_import_imported(struct _mail_msg *mm) ++elm_import_done(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - -- void (*receive_msg)(struct _mail_msg *msg); /* message received */ -- void (*reply_msg)(struct _mail_msg *msg); /* message replied */ -- void (*destroy_msg)(struct _mail_msg *msg); /* finalise message */ --} mail_msg_op_t; -+struct _MailMsgInfo { -+ gsize size; -+ MailMsgDescFunc desc; -+ MailMsgExecFunc exec; -+ MailMsgDoneFunc done; -+ MailMsgFreeFunc free; -+}; + printf("importing complete\n"); - /* setup ports */ - void mail_msg_init(void); - void mail_msg_cleanup (void); +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; -+gboolean mail_in_main_thread (void); -+ - /* allocate a new message */ --void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); --void mail_msg_free(void *msg); --void mail_msg_check_error(void *msg); -+gpointer mail_msg_new (MailMsgInfo *info); -+gpointer mail_msg_ref (gpointer msg); -+void mail_msg_unref (gpointer msg); -+void mail_msg_check_error (gpointer msg); - void mail_msg_cancel(unsigned int msgid); - void mail_msg_wait(unsigned int msgid); - void mail_msg_wait_all(void); - int mail_msg_active(unsigned int msgid); + gconf = gconf_client_get_default(); +@@ -228,10 +225,8 @@ elm_import_imported(struct _mail_msg *mm + } -+/* dispatch a message */ -+void mail_msg_main_loop_push (gpointer msg); -+void mail_msg_unordered_push (gpointer msg); -+void mail_msg_fast_ordered_push (gpointer msg); -+void mail_msg_slow_ordered_push (gpointer msg); -+ - /* To implement the stop button */ --void *mail_cancel_hook_add(GDestroyNotify func, void *data); --void mail_cancel_hook_remove(void *handle); --void mail_cancel_all(void); -+GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); -+void mail_cancel_hook_remove (GHook *hook); -+void mail_cancel_all (void); - - /* request a string/password */ - char *mail_get_password (CamelService *service, const char *prompt, -@@ -112,24 +129,6 @@ - void mail_enable_stop(void); - void mail_disable_stop(void); - --/* a message port that receives messages in the gui thread, used for sending port */ --extern EMsgPort *mail_gui_port; --/* a message port that receives messages in the gui thread, used for the reply port */ --extern EMsgPort *mail_gui_reply_port; + static void +-elm_import_free(struct _mail_msg *mm) ++elm_import_free(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - --/* some globally available threads */ --#ifndef G_OS_WIN32 --extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */ --#else --EThread *mail_win32_get_mail_thread_queued (void); --#define mail_thread_queued mail_win32_get_mail_thread_queued () --#endif --extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */ --extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ -- --/* The main thread. */ --extern pthread_t mail_gui_thread; -- - /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ - /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ - extern MailAsyncEvent *mail_async_event; ---- evolution-2.11.92/mail/mail-component.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-component.c 2007-09-04 00:19:08.000000000 -0400 -@@ -1005,7 +1005,7 @@ - if (camel_url_get_param(url, "uid") != NULL) { - char *curi = em_uri_to_camel(uri); + camel_operation_unref(m->status); -- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); -+ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); - g_free(curi); - } else { - g_warning("email uri's must include a uid parameter"); ---- evolution-2.11.92/mail/mail-vfolder.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-vfolder.c 2007-09-04 00:19:08.000000000 -0400 + g_free(m->status_what); +@@ -280,11 +275,12 @@ elm_status_timeout(void *data) + return TRUE; + } + +-static struct _mail_msg_op elm_import_op = { +- elm_import_describe, +- elm_import_import, +- elm_import_imported, +- elm_import_free, ++static MailMsgInfo elm_import_info = { ++ sizeof (struct _elm_import_msg), ++ (MailMsgDescFunc) elm_import_desc, ++ (MailMsgExecFunc) elm_import_exec, ++ (MailMsgDoneFunc) elm_import_done, ++ (MailMsgFreeFunc) elm_import_free + }; + + static int +@@ -293,7 +289,7 @@ mail_importer_elm_import(EImport *ei, EI + struct _elm_import_msg *m; + int id; + +- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&elm_import_info); + g_datalist_set_data(&target->data, "elm-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -302,9 +298,9 @@ mail_importer_elm_import(EImport *ei, EI + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(elm_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + return id; + } +diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution-2.21.1/mail/importers/mail-importer.c +--- evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 ++++ evolution-2.21.1/mail/importers/mail-importer.c 2007-10-29 14:47:50.000000000 -0400 +@@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact + } + + struct _import_mbox_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *path; + char *uri; +@@ -142,8 +142,8 @@ struct _import_mbox_msg { + void *done_data; + }; + +-static char * +-import_mbox_describe(struct _mail_msg *mm, int complete) ++static gchar * ++import_mbox_desc (struct _import_mbox_msg *m) + { + return g_strdup (_("Importing mailbox")); + } +@@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) + } + + static void +-import_mbox_import(struct _mail_msg *mm) ++import_mbox_exec (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; + CamelFolder *folder; + CamelMimeParser *mp = NULL; + struct stat st; +@@ -207,7 +206,7 @@ import_mbox_import(struct _mail_msg *mm) + if (m->uri == NULL || m->uri[0] == 0) + folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); + else +- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); ++ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); + + if (folder == NULL) + return; +@@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) + flags |= decode_status(tmp); + + camel_message_info_set_flags(info, flags, ~0); +- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); ++ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); + camel_message_info_free(info); + camel_object_unref(msg); + +- if (camel_exception_is_set(&mm->ex)) ++ if (camel_exception_is_set(&m->base.ex)) + break; + + camel_mime_parser_step(mp, 0, 0); +@@ -286,30 +285,27 @@ fail1: + } + + static void +-import_mbox_done(struct _mail_msg *mm) ++import_mbox_done (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->done) +- m->done(m->done_data, &mm->ex); ++ m->done(m->done_data, &m->base.ex); + } + + static void +-import_mbox_free (struct _mail_msg *mm) ++import_mbox_free (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->cancel) + camel_operation_unref(m->cancel); + g_free(m->uri); + g_free(m->path); + } + +-static struct _mail_msg_op import_mbox_op = { +- import_mbox_describe, +- import_mbox_import, +- import_mbox_done, +- import_mbox_free, ++static MailMsgInfo import_mbox_info = { ++ sizeof (struct _import_mbox_msg), ++ (MailMsgDescFunc) import_mbox_desc, ++ (MailMsgExecFunc) import_mbox_exec, ++ (MailMsgDoneFunc) import_mbox_done, ++ (MailMsgFreeFunc) import_mbox_free + }; + + int +@@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa + struct _import_mbox_msg *m; + int id; + +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + m->done = done; +@@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa + camel_operation_ref(cancel); + } + +- id = m->msg.seq; +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_fast_ordered_push (m); + + return id; + } +@@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha + { + struct _import_mbox_msg *m; + +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + if (cancel) { +@@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha + camel_operation_ref(cancel); + } + +- import_mbox_import(&m->msg); +- import_mbox_done(&m->msg); +- mail_msg_free(&m->msg); ++ import_mbox_exec(m); ++ import_mbox_done(m); ++ mail_msg_unref(m); + } + + struct _import_folders_data { +diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution-2.21.1/mail/importers/pine-importer.c +--- evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 ++++ evolution-2.21.1/mail/importers/pine-importer.c 2007-10-29 14:47:20.000000000 -0400 +@@ -56,7 +56,7 @@ + #define d(x) x + + struct _pine_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTarget *target; +@@ -223,8 +223,8 @@ import_contacts(void) + g_object_unref(book); + } + +-static char * +-pine_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++pine_import_desc (struct _pine_import_msg *m) + { + return g_strdup (_("Importing Pine data")); + } +@@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ + }; + + static void +-pine_import_import(struct _mail_msg *mm) ++pine_import_exec(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; +- + if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) + import_contacts(); + +@@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) + } + + static void +-pine_import_imported(struct _mail_msg *mm) ++pine_import_done(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + printf("importing complete\n"); + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; + + gconf = gconf_client_get_default(); +@@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m + } + + static void +-pine_import_free(struct _mail_msg *mm) ++pine_import_free(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + camel_operation_unref(m->status); + + g_free(m->status_what); +@@ -326,11 +320,12 @@ pine_status_timeout(void *data) + return TRUE; + } + +-static struct _mail_msg_op pine_import_op = { +- pine_import_describe, +- pine_import_import, +- pine_import_imported, +- pine_import_free, ++static MailMsgInfo pine_import_info = { ++ sizeof (struct _pine_import_msg), ++ (MailMsgDescFunc) pine_import_desc, ++ (MailMsgExecFunc) pine_import_exec, ++ (MailMsgDoneFunc) pine_import_done, ++ (MailMsgFreeFunc) pine_import_free + }; + + static int +@@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E + struct _pine_import_msg *m; + int id; + +- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&pine_import_info); + g_datalist_set_data(&target->data, "pine-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(pine_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + return id; + } +diff -up evolution-2.21.1/mail/em-utils.c.kill-ethread evolution-2.21.1/mail/em-utils.c +--- evolution-2.21.1/mail/em-utils.c.kill-ethread 2007-10-29 14:47:20.000000000 -0400 ++++ evolution-2.21.1/mail/em-utils.c 2007-10-29 14:47:20.000000000 -0400 +@@ -1912,7 +1912,7 @@ em_utils_in_addressbook(CamelInternetAdd + ESource *source = s->data; + GList *contacts; + EBook *book; +- void *hook; ++ GHook *hook; + + d(printf(" checking '%s'\n", e_source_get_uri(source))); + +diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail/mail-vfolder.c +--- evolution-2.21.1/mail/mail-vfolder.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-vfolder.c 2007-10-29 14:47:20.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3456,7 +2823,7 @@ #include #include -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul /* ********************************************************************** */ struct _setup_msg { @@ -3465,7 +2832,7 @@ CamelFolder *folder; char *query; -@@ -83,18 +83,15 @@ +@@ -83,18 +83,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3487,7 +2854,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -105,12 +102,12 @@ +@@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l && !shutdown) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3502,7 +2869,7 @@ } l = l->next; } -@@ -135,17 +132,13 @@ +@@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3522,7 +2889,7 @@ GList *l; camel_object_unref(m->folder); -@@ -166,11 +159,12 @@ +@@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3540,7 +2907,7 @@ }; /* sources_uri should be camel uri's */ -@@ -180,15 +174,15 @@ +@@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3559,7 +2926,7 @@ return id; } -@@ -196,17 +190,16 @@ +@@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const /* ********************************************************************** */ struct _adduri_msg { @@ -3580,7 +2947,7 @@ char *euri, *desc = NULL; /* Yuck yuck. Lookup the account name and use that to describe the path */ -@@ -250,9 +243,8 @@ +@@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm } static void @@ -3591,7 +2958,7 @@ GList *l; CamelFolder *folder = NULL; -@@ -269,7 +261,7 @@ +@@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) } if (folder == NULL) @@ -3600,7 +2967,7 @@ if (folder != NULL) { l = m->folders; -@@ -285,28 +277,24 @@ +@@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) } static void @@ -3637,7 +3004,7 @@ }; -@@ -317,13 +305,13 @@ +@@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f struct _adduri_msg *m; int id; @@ -3654,7 +3021,7 @@ return id; } -@@ -447,7 +435,7 @@ +@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, return; } @@ -3663,7 +3030,7 @@ is_ignore = uri_is_ignore(store, curi); -@@ -543,7 +531,7 @@ +@@ -543,7 +531,7 @@ mail_vfolder_delete_uri(CamelStore *stor d(printf ("Deleting uri to check: %s\n", uri)); @@ -3672,7 +3039,7 @@ changed = g_string_new (""); -@@ -627,7 +615,7 @@ +@@ -627,7 +615,7 @@ mail_vfolder_rename_uri(CamelStore *stor if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) return; @@ -3681,150 +3048,10 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.92/mail/em-folder-view.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-view.c 2007-09-04 00:19:08.000000000 -0400 -@@ -71,6 +71,7 @@ - #include - - #include -+#include - - #include "menus/gal-view-etable.h" - #include "menus/gal-view-factory-etable.h" -@@ -777,7 +778,7 @@ - static void - emfv_set_folder_uri(EMFolderView *emfv, const char *uri) - { -- mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); -+ mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); - } - - static void -@@ -1752,7 +1753,7 @@ - data->type = type; - data->source = source; - -- mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -1850,7 +1851,7 @@ - data->type = type; - data->uri = g_strdup (uri); - -- mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -2418,7 +2419,7 @@ - emfv->displayed_uid); - gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); - */ -- mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); -+ mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); - } else { - e_profile_event_emit("goto.empty", "", 0); - g_free(emfv->priv->selected_uid); ---- evolution-2.11.92/mail/em-folder-properties.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-properties.c 2007-09-04 00:19:08.000000000 -0400 -@@ -386,7 +386,7 @@ - } - - if (folder == NULL) -- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); -+ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); - else - emfp_dialog_got_folder((char *)uri, folder, NULL); - } ---- evolution-2.11.92/mail/mail-send-recv.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-send-recv.c 2007-09-04 00:19:08.000000000 -0400 -@@ -770,23 +770,22 @@ - /* ********************************************************************** */ - - struct _refresh_folders_msg { -- struct _mail_msg msg; -+ MailMsg base; - - struct _send_info *info; - GPtrArray *folders; - CamelStore *store; - }; - --static char * --refresh_folders_desc (struct _mail_msg *mm, int done) -+static gchar * -+refresh_folders_desc (struct _refresh_folders_msg *m) - { - return g_strdup_printf(_("Checking for new mail")); - } - - static void --refresh_folders_get (struct _mail_msg *mm) -+refresh_folders_exec (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; - CamelFolder *folder; - CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -808,17 +807,14 @@ - } - - static void --refresh_folders_got (struct _mail_msg *mm) -+refresh_folders_done (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; -- - receive_done("", m->info); - } - - static void --refresh_folders_free (struct _mail_msg *mm) -+refresh_folders_free (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; - - for (i=0;ifolders->len;i++) -@@ -827,11 +823,12 @@ - camel_object_unref(m->store); - } - --static struct _mail_msg_op refresh_folders_op = { -- refresh_folders_desc, -- refresh_folders_get, -- refresh_folders_got, -- refresh_folders_free, -+static MailMsgInfo refresh_folders_info = { -+ sizeof (struct _refresh_folders_msg), -+ (MailMsgDescFunc) refresh_folders_desc, -+ (MailMsgExecFunc) refresh_folders_exec, -+ (MailMsgDoneFunc) refresh_folders_done, -+ (MailMsgFreeFunc) refresh_folders_free - }; - - static void -@@ -864,13 +861,13 @@ - - get_folders(store, folders, info); - -- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&refresh_folders_info); - m->store = store; - camel_object_ref(store); - m->folders = folders; - m->info = sinfo; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - receive_done ("", data); - } ---- evolution-2.11.92/mail/em-format-html.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-format-html.c 2007-09-04 00:19:08.000000000 -0400 -@@ -165,7 +165,7 @@ +diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/mail/em-format-html.c +--- evolution-2.21.1/mail/em-format-html.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-format-html.c 2007-10-29 14:47:20.000000000 -0400 +@@ -176,7 +176,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3833,7 +3060,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1205,7 +1205,7 @@ +@@ -1205,7 +1205,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -3842,7 +3069,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1215,14 +1215,15 @@ +@@ -1215,14 +1215,15 @@ struct _format_msg { CamelMimeMessage *message; }; @@ -3861,7 +3088,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1307,10 +1308,9 @@ +@@ -1307,10 +1308,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -3874,7 +3101,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1318,10 +1318,9 @@ +@@ -1318,10 +1318,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } @@ -3887,7 +3114,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1337,11 +1336,12 @@ +@@ -1337,11 +1336,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } @@ -3905,7 +3132,7 @@ }; static gboolean -@@ -1352,7 +1352,7 @@ +@@ -1352,7 +1352,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3914,7 +3141,7 @@ return FALSE; } -@@ -1380,7 +1380,7 @@ +@@ -1380,7 +1380,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3923,7 +3150,7 @@ p->last_part = NULL; } else { hstream = gtk_html_begin(efh->html); -@@ -1404,8 +1404,8 @@ +@@ -1402,8 +1402,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } @@ -3934,7 +3161,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1429,11 +1429,11 @@ +@@ -1427,11 +1427,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3948,9 +3175,641 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.92/mail/em-sync-stream.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-sync-stream.h 2007-09-04 00:19:08.000000000 -0400 -@@ -29,41 +29,45 @@ +diff -up evolution-2.21.1/mail/em-folder-properties.c.kill-ethread evolution-2.21.1/mail/em-folder-properties.c +--- evolution-2.21.1/mail/em-folder-properties.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-folder-properties.c 2007-10-29 14:47:20.000000000 -0400 +@@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par + } + + if (folder == NULL) +- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); ++ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); + else + emfp_dialog_got_folder((char *)uri, folder, NULL); + } +diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/mail/em-folder-tree.c +--- evolution-2.21.1/mail/em-folder-tree.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-folder-tree.c 2007-10-29 14:47:20.000000000 -0400 +@@ -835,7 +835,7 @@ fail: + /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ + /* Drop handling */ + struct _DragDataReceivedAsync { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GdkDragContext *context; +@@ -860,17 +860,16 @@ emft_drop_folder(struct _DragDataReceive + + d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); + +- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) ++ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) + return; + + em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); + camel_object_unref(src); + } + +-static char * +-emft_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++emft_drop_async__desc (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelURL *url; + char *buf; + +@@ -894,9 +893,8 @@ emft_drop_async_desc (struct _mail_msg * + } + + static void +-emft_drop_async_drop (struct _mail_msg *mm) ++emft_drop_async__exec (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelFolder *folder; + + /* for types other than folder, we can't drop to the root path */ +@@ -904,14 +902,14 @@ emft_drop_async_drop (struct _mail_msg * + /* copy or move (aka rename) a folder */ + emft_drop_folder(m); + } else if (m->full_name == NULL) { +- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot drop message(s) into toplevel store")); +- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { ++ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { + switch (m->info) { + case DND_DROP_TYPE_UID_LIST: + /* import a list of uids from another evo folder */ +- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); +- m->moved = m->move && !camel_exception_is_set(&mm->ex); ++ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); ++ m->moved = m->move && !camel_exception_is_set(&m->base.ex); + break; + case DND_DROP_TYPE_MESSAGE_RFC822: + /* import a message/rfc822 stream */ +@@ -929,10 +927,25 @@ emft_drop_async_drop (struct _mail_msg * + } + + static void +-emft_drop_async_free (struct _mail_msg *mm) ++emft_drop_async__done (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; ++ gboolean success, delete; + ++ /* ?? */ ++ if (m->aborted) { ++ success = FALSE; ++ delete = FALSE; ++ } else { ++ success = !camel_exception_is_set (&m->base.ex); ++ delete = success && m->move && !m->moved; ++ } ++ ++ gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); ++} ++ ++static void ++emft_drop_async__free (struct _DragDataReceivedAsync *m) ++{ + g_object_unref(m->context); + camel_object_unref(m->store); + g_free(m->full_name); +@@ -941,18 +954,19 @@ emft_drop_async_free (struct _mail_msg * + g_free(m->selection); + } + +-static struct _mail_msg_op emft_drop_async_op = { +- emft_drop_async_desc, +- emft_drop_async_drop, +- NULL, +- emft_drop_async_free, ++static MailMsgInfo emft_drop_async_info = { ++ sizeof (struct _DragDataReceivedAsync), ++ (MailMsgDescFunc) emft_drop_async__desc, ++ (MailMsgExecFunc) emft_drop_async__exec, ++ (MailMsgDoneFunc) emft_drop_async__done, ++ (MailMsgFreeFunc) emft_drop_async__free + }; + + static void + tree_drag_data_action(struct _DragDataReceivedAsync *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static void +@@ -979,7 +993,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu + struct _DragDataReceivedAsync *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem emft_drop_popup_menu[] = { +@@ -1035,7 +1049,7 @@ tree_drag_data_received(GtkWidget *widge + return; + } + +- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); ++ m = mail_msg_new (&emft_drop_async_info); + m->context = context; + g_object_ref(context); + m->store = store; +@@ -1674,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) + #endif + + struct _EMFolderTreeGetFolderInfo { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GtkTreeRowReference *root; +@@ -1687,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { + CamelFolderInfo *fi; + }; + +-static char * +-emft_get_folder_info__desc(struct _mail_msg *mm, int done) ++static gchar * ++emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; + char *ret, *name; + + name = camel_service_get_name((CamelService *)m->store, TRUE); +@@ -1700,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ + } + + static void +-emft_get_folder_info__get (struct _mail_msg *mm) ++emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + +- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); ++ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); + } + + static void +-emft_get_folder_info__got (struct _mail_msg *mm) ++emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + struct _EMFolderTreePrivate *priv = m->emft->priv; + struct _EMFolderTreeModelStoreInfo *si; + GtkTreeIter root, iter; +@@ -1739,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ + gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); + + /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ +- if (!m->fi && camel_exception_is_set(&mm->ex)) { ++ if (!m->fi && camel_exception_is_set(&m->base.ex)) { + gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); + gtk_tree_view_collapse_row (priv->treeview, path); + gtk_tree_path_free (path); +@@ -1794,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ + } + + static void +-emft_get_folder_info__free (struct _mail_msg *mm) ++emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + + gtk_tree_row_reference_free (m->root); +@@ -1806,11 +1815,12 @@ emft_get_folder_info__free (struct _mail + g_free (m->top); + } + +-static struct _mail_msg_op get_folder_info_op = { +- emft_get_folder_info__desc, +- emft_get_folder_info__get, +- emft_get_folder_info__got, +- emft_get_folder_info__free, ++static MailMsgInfo get_folder_info_info = { ++ sizeof (struct _EMFolderTreeGetFolderInfo), ++ (MailMsgDescFunc) emft_get_folder_info__desc, ++ (MailMsgExecFunc) emft_get_folder_info__exec, ++ (MailMsgDoneFunc) emft_get_folder_info__done, ++ (MailMsgFreeFunc) emft_get_folder_info__free + }; + + static void +@@ -1897,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre + + gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); + +- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); ++ m = mail_msg_new (&get_folder_info_info); + m->root = gtk_tree_row_reference_new (model, tree_path); + camel_object_ref (store); + m->store = store; +@@ -1906,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre + m->top = full_name; + m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static gboolean +diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1/mail/em-folder-browser.c +--- evolution-2.21.1/mail/em-folder-browser.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-folder-browser.c 2007-10-29 14:47:20.000000000 -0400 +@@ -848,7 +848,7 @@ get_view_query (ESearchBar *esb) + + + struct _setup_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + char *query; +@@ -856,16 +856,15 @@ struct _setup_msg { + GList *sources_folder; + }; + +-static char * +-vfolder_setup_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_setup_desc(struct _setup_msg *m) + { + return g_strdup(_("Searching")); + } + + static void +-vfolder_setup_do(struct _mail_msg *mm) ++vfolder_setup_exec(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l, *list = NULL; + CamelFolder *folder; + +@@ -876,12 +875,12 @@ vfolder_setup_do(struct _mail_msg *mm) + l = m->sources_uri; + while (l) { + d(printf(" Adding uri: %s\n", (char *)l->data)); +- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); + if (folder) { + list = g_list_append(list, folder); + } else { + g_warning("Could not open vfolder source: %s", (char *)l->data); +- camel_exception_clear(&mm->ex); ++ camel_exception_clear(&m->base.ex); + } + l = l->next; + } +@@ -905,17 +904,13 @@ vfolder_setup_do(struct _mail_msg *mm) + } + + static void +-vfolder_setup_done(struct _mail_msg *mm) ++vfolder_setup_done(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; +- +- m = m; + } + + static void +-vfolder_setup_free (struct _mail_msg *mm) ++vfolder_setup_free (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l; + + camel_object_unref(m->folder); +@@ -936,11 +931,12 @@ vfolder_setup_free (struct _mail_msg *mm + g_list_free(m->sources_folder); + } + +-static struct _mail_msg_op vfolder_setup_op = { +- vfolder_setup_desc, +- vfolder_setup_do, +- vfolder_setup_done, +- vfolder_setup_free, ++static MailMsgInfo vfolder_setup_info = { ++ sizeof (struct _setup_msg), ++ (MailMsgDescFunc) vfolder_setup_desc, ++ (MailMsgExecFunc) vfolder_setup_exec, ++ (MailMsgDoneFunc) vfolder_setup_done, ++ (MailMsgFreeFunc) vfolder_setup_free + }; + + /* sources_uri should be camel uri's */ +@@ -950,15 +946,15 @@ vfolder_setup(CamelFolder *folder, const + struct _setup_msg *m; + int id; + +- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_setup_info); + m->folder = folder; + camel_object_ref(folder); + m->query = g_strdup(query); + m->sources_uri = sources_uri; + m->sources_folder = sources_folder; + +- id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); + + return id; + } +diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail/message-list.c +--- evolution-2.21.1/mail/message-list.c.kill-ethread 2007-10-28 22:02:16.000000000 -0400 ++++ evolution-2.21.1/mail/message-list.c 2007-10-29 14:47:20.000000000 -0400 +@@ -1848,7 +1848,7 @@ ml_tree_drag_data_get (ETree *tree, int + /* TODO: merge this with the folder tree stuff via empopup targets */ + /* Drop handling */ + struct _drop_msg { +- struct _mail_msg msg; ++ MailMsg base; + + GdkDragContext *context; + +@@ -1865,11 +1865,9 @@ struct _drop_msg { + unsigned int aborted:1; + }; + +-static char * +-ml_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++ml_drop_async_desc (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *) mm; +- + if (m->move) + return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); + else +@@ -1877,13 +1875,11 @@ ml_drop_async_desc (struct _mail_msg *mm + } + + static void +-ml_drop_async_drop(struct _mail_msg *mm) ++ml_drop_async_exec (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + switch (m->info) { + case DND_X_UID_LIST: +- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); ++ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); + break; + case DND_MESSAGE_RFC822: + em_utils_selection_get_message(m->selection, m->folder); +@@ -1895,9 +1891,8 @@ ml_drop_async_drop(struct _mail_msg *mm) + } + + static void +-ml_drop_async_done(struct _mail_msg *mm) ++ml_drop_async_done (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; + gboolean success, delete; + + /* ?? */ +@@ -1905,7 +1900,7 @@ ml_drop_async_done(struct _mail_msg *mm) + success = FALSE; + delete = FALSE; + } else { +- success = !camel_exception_is_set (&mm->ex); ++ success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } + +@@ -1913,10 +1908,8 @@ ml_drop_async_done(struct _mail_msg *mm) + } + + static void +-ml_drop_async_free(struct _mail_msg *mm) ++ml_drop_async_free (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + g_object_unref(m->context); + camel_object_unref(m->folder); + +@@ -1924,18 +1917,19 @@ ml_drop_async_free(struct _mail_msg *mm) + g_free(m->selection); + } + +-static struct _mail_msg_op ml_drop_async_op = { +- ml_drop_async_desc, +- ml_drop_async_drop, +- ml_drop_async_done, +- ml_drop_async_free, ++static MailMsgInfo ml_drop_async_info = { ++ sizeof (struct _drop_msg), ++ (MailMsgDescFunc) ml_drop_async_desc, ++ (MailMsgExecFunc) ml_drop_async_exec, ++ (MailMsgDoneFunc) ml_drop_async_done, ++ (MailMsgFreeFunc) ml_drop_async_free + }; + + static void + ml_drop_action(struct _drop_msg *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static void +@@ -1962,7 +1956,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI + struct _drop_msg *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem ml_drop_popup_menu[] = { +@@ -1992,7 +1986,7 @@ ml_tree_drag_data_received (ETree *tree, + if (!ml->folder || data->data == NULL || data->length == -1) + return; + +- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&ml_drop_async_info); + m->context = context; + g_object_ref(context); + m->folder = ml->folder; +@@ -3718,7 +3712,7 @@ save_hide_state (MessageList *ml) + + /* ** REGENERATE MESSAGELIST ********************************************** */ + struct _regen_list_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int complete; + +@@ -3746,16 +3740,15 @@ struct _regen_list_msg { + + */ + +-static char * +-regen_list_describe (struct _mail_msg *mm, gint complete) ++static gchar * ++regen_list_desc (struct _regen_list_msg *m) + { + return g_strdup (_("Generating message list")); + } + + static void +-regen_list_regen (struct _mail_msg *mm) ++regen_list_exec (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; + CamelMessageInfo *info; + int i; +@@ -3785,7 +3778,7 @@ regen_list_regen (struct _mail_msg *mm) + } else + expr = "(match-all (not (system-flag \"deleted\")))"; + } +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + char *expr; + +@@ -3795,23 +3788,23 @@ regen_list_regen (struct _mail_msg *mm) + sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); + } else + expr = "(match-all (not (system-flag \"junk\")))"; +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + if (m->search) +- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); + else + uids = camel_folder_get_uids (m->folder); + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + return; + + /* perform hiding */ + if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { +- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); ++ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); + /* well, lets not abort just because this faileld ... */ +- camel_exception_clear (&mm->ex); ++ camel_exception_clear (&m->base.ex); + + if (uidnew) { + MESSAGE_LIST_LOCK(m->ml, hide_lock); +@@ -3886,7 +3879,7 @@ regen_list_regen (struct _mail_msg *mm) + + e_profile_event_emit("list.threaduids", m->folder->full_name, 0); + +- if (!camel_operation_cancel_check(mm->cancel)) { ++ if (!camel_operation_cancel_check(m->base.cancel)) { + /* update/build a new tree */ + if (m->dotree) { + if (m->tree) +@@ -3915,17 +3908,15 @@ regen_list_regen (struct _mail_msg *mm) + } + + static void +-regen_list_regened (struct _mail_msg *mm) ++regen_list_done (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; +- + if (m->ml->priv->destroyed) + return; + + if (!m->complete) + return; + +- if (camel_operation_cancel_check(mm->cancel)) ++ if (camel_operation_cancel_check(m->base.cancel)) + return; + + if (m->ml->folder != m->folder) +@@ -3976,9 +3967,8 @@ regen_list_regened (struct _mail_msg *mm + } + + static void +-regen_list_free (struct _mail_msg *mm) ++regen_list_free (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + int i; + + e_profile_event_emit("list.regenerated", m->folder->full_name, 0); +@@ -4006,11 +3996,12 @@ regen_list_free (struct _mail_msg *mm) + g_object_unref(m->ml); + } + +-static struct _mail_msg_op regen_list_op = { +- regen_list_describe, +- regen_list_regen, +- regen_list_regened, +- regen_list_free, ++static MailMsgInfo regen_list_info = { ++ sizeof (struct _regen_list_msg), ++ (MailMsgDescFunc) regen_list_desc, ++ (MailMsgExecFunc) regen_list_exec, ++ (MailMsgDoneFunc) regen_list_done, ++ (MailMsgFreeFunc) regen_list_free + }; + + static gboolean +@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg + + m->ml->regen = g_list_prepend(m->ml->regen, m); + /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ +- e_thread_put (mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + m->ml->regen_timeout_msg = NULL; + m->ml->regen_timeout_id = 0; +@@ -4036,7 +4027,7 @@ mail_regen_cancel(MessageList *ml) + GList *l = ml->regen; + + while (l) { +- struct _mail_msg *mm = l->data; ++ MailMsg *mm = l->data; + + if (mm->cancel) + camel_operation_cancel(mm->cancel); +@@ -4048,7 +4039,7 @@ mail_regen_cancel(MessageList *ml) + if (ml->regen_timeout_id) { + g_source_remove(ml->regen_timeout_id); + ml->regen_timeout_id = 0; +- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); ++ mail_msg_unref(ml->regen_timeout_msg); + ml->regen_timeout_msg = NULL; + } + } +@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const + } + #endif + +- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); ++ m = mail_msg_new (®en_list_info); + m->ml = ml; + m->search = g_strdup (search); + m->hideexpr = g_strdup (hideexpr); +diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/mail/em-sync-stream.h +--- evolution-2.21.1/mail/em-sync-stream.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-sync-stream.h 2007-10-29 14:47:20.000000000 -0400 +@@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -4026,226 +3885,10 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.92/mail/em-subscribe-editor.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-subscribe-editor.c 2007-09-04 00:19:08.000000000 -0400 -@@ -175,7 +175,7 @@ - /* ** Subscribe folder operation **************************************** */ - - struct _zsubscribe_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EMSubscribe *sub; - EMSubscribeNode *node; -@@ -184,20 +184,18 @@ - }; - - static void --sub_folder_subscribe (struct _mail_msg *mm) -+sub_folder_exec (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - if (m->subscribe) -- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - else -- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - } - - static void --sub_folder_subscribed (struct _mail_msg *mm) -+sub_folder_done (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; -+ struct _zsubscribe_msg *next; - GtkTreeIter iter; - GtkTreeModel *model; - EMSubscribeNode *node; -@@ -207,7 +205,7 @@ - if (m->sub->cancel) - return; - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - if (m->subscribe) - m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; - else -@@ -228,8 +226,8 @@ - /* queue any further ones, or if out, update the ui */ - next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); - if (next) { -- next->sub->subscribe_id = next->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)next); -+ next->sub->subscribe_id = next->base.seq; -+ mail_msg_unordered_push (next); - } else { - /* should it go off the model instead? */ - sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -237,19 +235,18 @@ - } - - static void --sub_folder_free (struct _mail_msg *mm) -+sub_folder_free (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - g_free(m->path); - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_subscribe_folder_op = { -- NULL, /*subscribe_folder_desc,*/ -- sub_folder_subscribe, -- sub_folder_subscribed, -- sub_folder_free, -+static MailMsgInfo sub_subscribe_folder_info = { -+ sizeof (struct _zsubscribe_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folder_exec, -+ (MailMsgDoneFunc) sub_folder_done, -+ (MailMsgFreeFunc) sub_folder_free - }; - - /* spath is tree path in string form */ -@@ -259,18 +256,18 @@ - struct _zsubscribe_msg *m; - int id; - -- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_subscribe_folder_info); - m->sub = sub; - sub_ref(sub); - m->node = node; - m->subscribe = state; - m->path = g_strdup(spath); - -- id = m->msg.seq; -+ id = m->base.seq; - if (sub->subscribe_id == -1) { - sub->subscribe_id = id; - d(printf("running subscribe folder '%s'\n", spath)); -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - d(printf("queueing subscribe folder '%s'\n", spath)); - e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -341,7 +338,7 @@ - /* async query of folderinfo */ - - struct _emse_folderinfo_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int seq; - -@@ -351,31 +348,29 @@ - }; - - static void --sub_folderinfo_get (struct _mail_msg *mm) -+sub_folderinfo_exec (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - char *pub_full_name=NULL; - - if (m->seq == m->sub->seq) { -- camel_operation_register(mm->cancel); -- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); -- camel_operation_unregister(mm->cancel); -+ camel_operation_register(m->base.cancel); -+ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); -+ camel_operation_unregister(m->base.cancel); - } - } - - static void --sub_folderinfo_got(struct _mail_msg *mm) -+sub_folderinfo_done (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - EMSubscribeNode *node; - - m->sub->pending_id = -1; - if (m->sub->cancel || m->seq != m->sub->seq) - return; - -- if (camel_exception_is_set (&mm->ex)) { -+ if (camel_exception_is_set (&m->base.ex)) { - g_warning ("Error getting folder info from store: %s", -- camel_exception_get_description (&mm->ex)); -+ camel_exception_get_description (&m->base.ex)); - } - - if (m->info) { -@@ -396,10 +391,8 @@ - } - - static void --sub_folderinfo_free(struct _mail_msg *mm) -+sub_folderinfo_free (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; -- - if (m->info) - m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); - -@@ -415,11 +408,12 @@ - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_folderinfo_op = { -- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ -- sub_folderinfo_get, -- sub_folderinfo_got, -- sub_folderinfo_free, -+static MailMsgInfo sub_folderinfo_info = { -+ sizeof (struct _emse_folderinfo_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folderinfo_exec, -+ (MailMsgDoneFunc) sub_folderinfo_done, -+ (MailMsgFreeFunc) sub_folderinfo_free - }; - - static int -@@ -431,19 +425,19 @@ - d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, - node?node->info->full_name:"")); - -- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_folderinfo_info); - sub_ref(sub); - m->sub = sub; - m->node = node; - m->seq = sub->seq; - -- sub->pending_id = m->msg.seq; -+ sub->pending_id = m->base.seq; - - sub_editor_busy(sub->editor, 1); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - return id; - } - -@@ -573,7 +567,7 @@ - mail_msg_cancel(sub->subscribe_id); - - while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) -- mail_msg_free(m); -+ mail_msg_unref(m); - - sub_unref(sub); - } ---- evolution-2.11.92/mail/em-format-html-print.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-format-html-print.c 2007-09-04 00:19:08.000000000 -0400 -@@ -228,7 +228,7 @@ +diff -up evolution-2.21.1/mail/em-format-html-print.c.kill-ethread evolution-2.21.1/mail/em-format-html-print.c +--- evolution-2.21.1/mail/em-format-html-print.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-format-html-print.c 2007-10-29 14:47:20.000000000 -0400 +@@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); mail_get_message ( @@ -4254,922 +3897,9 @@ } void ---- evolution-2.11.92/mail/mail-session.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-session.c 2007-09-04 00:19:08.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - - #include --#include -+#include - - #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ - #include -@@ -264,148 +264,145 @@ - - /* ********************************************************************** */ - --static GtkDialog *message_dialog; --static EDList message_list = E_DLIST_INITIALISER(message_list); -+static gpointer user_message_dialog; -+static GQueue user_message_queue = { NULL, NULL, 0 }; - - struct _user_message_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelSessionAlertType type; - char *prompt; -+ EFlag *done; - - unsigned int allow_cancel:1; - unsigned int result:1; - unsigned int ismain:1; - }; - --static void do_user_message (struct _mail_msg *mm); -+static void user_message_exec (struct _user_message_msg *m); - - /* clicked, send back the reply */ - static void - user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) - { - gtk_widget_destroy ((GtkWidget *) dialog); -- -- message_dialog = NULL; -- -+ -+ user_message_dialog = NULL; -+ - /* if !allow_cancel, then we've already replied */ - if (m->allow_cancel) { - m->result = button == GTK_RESPONSE_OK; -- e_msgport_reply((EMsg *)m); -+ e_flag_set (m->done); - } - - /* check for pendings */ -- if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) -- do_user_message((struct _mail_msg *)m); --} -- --static void --user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef) --{ -- message_dialog = NULL; -+ if (!g_queue_is_empty (&user_message_queue)) { -+ m = g_queue_pop_head (&user_message_queue); -+ user_message_exec (m); -+ mail_msg_unref (m); -+ } - } - --/* This is kinda ugly/inefficient, but oh well, it works */ --static const char *error_type[] = { -- "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", -- "mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel" --}; -- - static void --do_user_message (struct _mail_msg *mm) -+user_message_exec (struct _user_message_msg *m) - { -- struct _user_message_msg *m = (struct _user_message_msg *)mm; -- int type; -+ const gchar *error_type; - -- if (!m->ismain && message_dialog != NULL) { -- e_dlist_addtail (&message_list, (EDListNode *)m); -+ if (!m->ismain && user_message_dialog != NULL) { -+ g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); - return; - } - - switch (m->type) { -- case CAMEL_SESSION_ALERT_INFO: -- type = 0; -- break; -- case CAMEL_SESSION_ALERT_WARNING: -- type = 1; -- break; -- case CAMEL_SESSION_ALERT_ERROR: -- type = 2; -- break; -- default: -- type = 0; -- } -- -- if (m->allow_cancel) -- type += 3; -- -- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); -- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); -- -- /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ -- if (m->allow_cancel) { -- if (m->ismain) { -- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); -- } else { -- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); -- gtk_widget_show ((GtkWidget *) message_dialog); -- } -+ case CAMEL_SESSION_ALERT_INFO: -+ error_type = m->allow_cancel ? -+ "mail:session-message-info-cancel" : -+ "mail:session-message-info"; -+ break; -+ case CAMEL_SESSION_ALERT_WARNING: -+ error_type = m->allow_cancel ? -+ "mail:session-message-warning-cancel" : -+ "mail:session-message-warning"; -+ break; -+ case CAMEL_SESSION_ALERT_ERROR: -+ error_type = m->allow_cancel ? -+ "mail:session-message-error-cancel" : -+ "mail:session-message-error"; -+ break; -+ default: -+ g_assert_not_reached (); -+ } -+ -+ user_message_dialog = e_error_new (NULL, error_type, m->prompt, NULL); -+ g_object_set ( -+ user_message_dialog, "allow_shrink", TRUE, -+ "allow_grow", TRUE, NULL); -+ -+ /* We only need to wait for the result if we allow cancel -+ * otherwise show but send result back instantly */ -+ if (m->allow_cancel && m->ismain) { -+ gint response = gtk_dialog_run (user_message_dialog); -+ user_message_response (user_message_dialog, response, m); - } else { -- g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); -- g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); -- gtk_widget_show ((GtkWidget *) message_dialog); -- mail_msg_free(m); -+ g_signal_connect ( -+ user_message_dialog, "response", -+ G_CALLBACK (user_message_response), m); -+ gtk_widget_show (user_message_dialog); - } - } - - static void --free_user_message(struct _mail_msg *mm) -+user_message_free (struct _user_message_msg *m) - { -- struct _user_message_msg *m = (struct _user_message_msg *)mm; -- - g_free(m->prompt); -+ e_flag_free(m->done); - } - --static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; -+static MailMsgInfo user_message_info = { -+ sizeof (struct _user_message_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) user_message_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) user_message_free -+}; - - static gboolean - alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) - { - MailSession *mail_session = MAIL_SESSION (session); -- struct _user_message_msg *m, *r; -- EMsgPort *user_message_reply = NULL; -- gboolean ret; -+ struct _user_message_msg *m; -+ gboolean result = TRUE; - - if (!mail_session->interactive) - return FALSE; - -- if (cancel) -- user_message_reply = e_msgport_new (); -- m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); -- m->ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ m = mail_msg_new (&user_message_info); -+ m->ismain = mail_in_main_thread (); - m->type = type; -- m->prompt = g_strdup(prompt); -+ m->prompt = g_strdup (prompt); -+ m->done = e_flag_new (); - m->allow_cancel = cancel; - -- if (m->ismain) -- do_user_message((struct _mail_msg *)m); -- else { -- extern EMsgPort *mail_gui_port2; -+ if (cancel) -+ mail_msg_ref (m); - -- e_msgport_put(mail_gui_port2, (EMsg *)m); -- } -+ if (m->ismain) -+ user_message_exec (m); -+ else -+ mail_msg_main_loop_push (m); - - if (cancel) { -- r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); -- g_return_val_if_fail (m == r, FALSE); -+ e_flag_wait (m->done); -+ result = m->result; -+ mail_msg_unref (m); -+ } - -- ret = m->result; -- mail_msg_free(m); -- e_msgport_destroy(user_message_reply); -- } else -- ret = TRUE; -+ if (m->ismain) { -+ user_message_free (m); -+ mail_msg_unref (m); -+ } - -- return ret; -+ return result; - } - - static CamelFolder * -@@ -541,7 +538,7 @@ - /* TODO: This is very temporary, until we have a better way to do the progress reporting, - we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ - --static mail_msg_op_t ms_thread_ops_dummy = { NULL }; -+static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; - - static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) - { -@@ -550,7 +547,7 @@ - /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so - we get cancellation and progress in common with hte existing mail code, for free */ - if (msg) { -- struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); -+ MailMsg *m = mail_msg_new(&ms_thread_info_dummy); - - msg->data = m; - camel_operation_unref(msg->op); -@@ -563,7 +560,7 @@ - - static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) - { -- mail_msg_free(m->data); -+ mail_msg_unref(m->data); - ms_parent_class->thread_msg_free(session, m); - } - -@@ -686,22 +683,23 @@ - MAIL_SESSION (session)->interactive = interactive; - - if (!interactive) { -- struct _user_message_msg *um; -+ struct _user_message_msg *msg; - - d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - - e_passwords_cancel(); - - /* flush/cancel pending user messages */ -- while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { -- d(printf ("Flusing message request: %s\n", um->prompt)); -- e_msgport_reply((EMsg *) um); -+ while (!g_queue_is_empty (&user_message_queue)) { -+ msg = g_queue_pop_head (&user_message_queue); -+ e_flag_set (msg->done); -+ mail_msg_unref (msg); - } - - /* and the current */ -- if (message_dialog) { -+ if (user_message_dialog) { - d(printf("Destroying message dialogue\n")); -- gtk_widget_destroy ((GtkWidget *) message_dialog); -+ gtk_widget_destroy ((GtkWidget *) user_message_dialog); - } - } - } ---- evolution-2.11.92/mail/message-list.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/message-list.c 2007-09-04 00:19:08.000000000 -0400 -@@ -1841,7 +1841,7 @@ - /* TODO: merge this with the folder tree stuff via empopup targets */ - /* Drop handling */ - struct _drop_msg { -- struct _mail_msg msg; -+ MailMsg base; - - GdkDragContext *context; - -@@ -1858,11 +1858,9 @@ - unsigned int aborted:1; - }; - --static char * --ml_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+ml_drop_async_desc (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *) mm; -- - if (m->move) - return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); - else -@@ -1870,13 +1868,11 @@ - } - - static void --ml_drop_async_drop(struct _mail_msg *mm) -+ml_drop_async_exec (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - switch (m->info) { - case DND_X_UID_LIST: -- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); -+ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); - break; - case DND_MESSAGE_RFC822: - em_utils_selection_get_message(m->selection, m->folder); -@@ -1888,9 +1884,8 @@ - } - - static void --ml_drop_async_done(struct _mail_msg *mm) -+ml_drop_async_done (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; - gboolean success, delete; - - /* ?? */ -@@ -1898,7 +1893,7 @@ - success = FALSE; - delete = FALSE; - } else { -- success = !camel_exception_is_set (&mm->ex); -+ success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - -@@ -1906,10 +1901,8 @@ - } - - static void --ml_drop_async_free(struct _mail_msg *mm) -+ml_drop_async_free (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - g_object_unref(m->context); - camel_object_unref(m->folder); - -@@ -1917,18 +1910,19 @@ - g_free(m->selection); - } - --static struct _mail_msg_op ml_drop_async_op = { -- ml_drop_async_desc, -- ml_drop_async_drop, -- ml_drop_async_done, -- ml_drop_async_free, -+static MailMsgInfo ml_drop_async_info = { -+ sizeof (struct _drop_msg), -+ (MailMsgDescFunc) ml_drop_async_desc, -+ (MailMsgExecFunc) ml_drop_async_exec, -+ (MailMsgDoneFunc) ml_drop_async_done, -+ (MailMsgFreeFunc) ml_drop_async_free - }; - - static void - ml_drop_action(struct _drop_msg *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -1955,7 +1949,7 @@ - struct _drop_msg *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem ml_drop_popup_menu[] = { -@@ -1985,7 +1979,7 @@ - if (!ml->folder || data->data == NULL || data->length == -1) - return; - -- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&ml_drop_async_info); - m->context = context; - g_object_ref(context); - m->folder = ml->folder; -@@ -3721,7 +3715,7 @@ - - /* ** REGENERATE MESSAGELIST ********************************************** */ - struct _regen_list_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int complete; - -@@ -3749,16 +3743,15 @@ - - */ - --static char * --regen_list_describe (struct _mail_msg *mm, gint complete) -+static gchar * -+regen_list_desc (struct _regen_list_msg *m) - { - return g_strdup (_("Generating message list")); - } - - static void --regen_list_regen (struct _mail_msg *mm) -+regen_list_exec (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; - CamelMessageInfo *info; - int i; -@@ -3788,7 +3781,7 @@ - } else - expr = "(match-all (not (system-flag \"deleted\")))"; - } -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - char *expr; - -@@ -3798,23 +3791,23 @@ - sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); - } else - expr = "(match-all (not (system-flag \"junk\")))"; -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - if (m->search) -- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); - else - uids = camel_folder_get_uids (m->folder); - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - return; - - /* perform hiding */ - if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { -- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); -+ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); - /* well, lets not abort just because this faileld ... */ -- camel_exception_clear (&mm->ex); -+ camel_exception_clear (&m->base.ex); - - if (uidnew) { - MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3889,7 +3882,7 @@ - - e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - -- if (!camel_operation_cancel_check(mm->cancel)) { -+ if (!camel_operation_cancel_check(m->base.cancel)) { - /* update/build a new tree */ - if (m->dotree) { - if (m->tree) -@@ -3918,17 +3911,15 @@ - } - - static void --regen_list_regened (struct _mail_msg *mm) -+regen_list_done (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; -- - if (m->ml->priv->destroyed) - return; - - if (!m->complete) - return; - -- if (camel_operation_cancel_check(mm->cancel)) -+ if (camel_operation_cancel_check(m->base.cancel)) - return; - - if (m->ml->folder != m->folder) -@@ -3979,9 +3970,8 @@ - } - - static void --regen_list_free (struct _mail_msg *mm) -+regen_list_free (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - int i; - - e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -4009,11 +3999,12 @@ - g_object_unref(m->ml); - } - --static struct _mail_msg_op regen_list_op = { -- regen_list_describe, -- regen_list_regen, -- regen_list_regened, -- regen_list_free, -+static MailMsgInfo regen_list_info = { -+ sizeof (struct _regen_list_msg), -+ (MailMsgDescFunc) regen_list_desc, -+ (MailMsgExecFunc) regen_list_exec, -+ (MailMsgDoneFunc) regen_list_done, -+ (MailMsgFreeFunc) regen_list_free - }; - - static gboolean -@@ -4023,7 +4014,7 @@ - - m->ml->regen = g_list_prepend(m->ml->regen, m); - /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ -- e_thread_put (mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - m->ml->regen_timeout_msg = NULL; - m->ml->regen_timeout_id = 0; -@@ -4039,7 +4030,7 @@ - GList *l = ml->regen; - - while (l) { -- struct _mail_msg *mm = l->data; -+ MailMsg *mm = l->data; - - if (mm->cancel) - camel_operation_cancel(mm->cancel); -@@ -4051,7 +4042,7 @@ - if (ml->regen_timeout_id) { - g_source_remove(ml->regen_timeout_id); - ml->regen_timeout_id = 0; -- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); -+ mail_msg_unref(ml->regen_timeout_msg); - ml->regen_timeout_msg = NULL; - } - } -@@ -4086,7 +4077,7 @@ - } - #endif - -- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); -+ m = mail_msg_new (®en_list_info); - m->ml = ml; - m->search = g_strdup (search); - m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.92/mail/em-folder-tree.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-tree.c 2007-09-04 00:19:08.000000000 -0400 -@@ -835,7 +835,7 @@ - /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ - /* Drop handling */ - struct _DragDataReceivedAsync { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GdkDragContext *context; -@@ -860,17 +860,16 @@ - - d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - -- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) -+ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) - return; - - em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); - camel_object_unref(src); - } - --static char * --emft_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+emft_drop_async__desc (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelURL *url; - char *buf; - -@@ -894,9 +893,8 @@ - } - - static void --emft_drop_async_drop (struct _mail_msg *mm) -+emft_drop_async__exec (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelFolder *folder; - - /* for types other than folder, we can't drop to the root path */ -@@ -904,14 +902,14 @@ - /* copy or move (aka rename) a folder */ - emft_drop_folder(m); - } else if (m->full_name == NULL) { -- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot drop message(s) into toplevel store")); -- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { -+ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { - switch (m->info) { - case DND_DROP_TYPE_UID_LIST: - /* import a list of uids from another evo folder */ -- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); -- m->moved = m->move && !camel_exception_is_set(&mm->ex); -+ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); -+ m->moved = m->move && !camel_exception_is_set(&m->base.ex); - break; - case DND_DROP_TYPE_MESSAGE_RFC822: - /* import a message/rfc822 stream */ -@@ -929,10 +927,25 @@ - } - - static void --emft_drop_async_free (struct _mail_msg *mm) -+emft_drop_async__done (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; -+ gboolean success, delete; - -+ /* ?? */ -+ if (m->aborted) { -+ success = FALSE; -+ delete = FALSE; -+ } else { -+ success = !camel_exception_is_set (&m->base.ex); -+ delete = success && m->move && !m->moved; -+ } -+ -+ gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); -+} -+ -+static void -+emft_drop_async__free (struct _DragDataReceivedAsync *m) -+{ - g_object_unref(m->context); - camel_object_unref(m->store); - g_free(m->full_name); -@@ -941,18 +954,19 @@ - g_free(m->selection); - } - --static struct _mail_msg_op emft_drop_async_op = { -- emft_drop_async_desc, -- emft_drop_async_drop, -- NULL, -- emft_drop_async_free, -+static MailMsgInfo emft_drop_async_info = { -+ sizeof (struct _DragDataReceivedAsync), -+ (MailMsgDescFunc) emft_drop_async__desc, -+ (MailMsgExecFunc) emft_drop_async__exec, -+ (MailMsgDoneFunc) emft_drop_async__done, -+ (MailMsgFreeFunc) emft_drop_async__free - }; - - static void - tree_drag_data_action(struct _DragDataReceivedAsync *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -979,7 +993,7 @@ - struct _DragDataReceivedAsync *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem emft_drop_popup_menu[] = { -@@ -1035,7 +1049,7 @@ - return; - } - -- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); -+ m = mail_msg_new (&emft_drop_async_info); - m->context = context; - g_object_ref(context); - m->store = store; -@@ -1674,7 +1688,7 @@ - #endif - - struct _EMFolderTreeGetFolderInfo { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GtkTreeRowReference *root; -@@ -1687,10 +1701,9 @@ - CamelFolderInfo *fi; - }; - --static char * --emft_get_folder_info__desc(struct _mail_msg *mm, int done) -+static gchar * -+emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; - char *ret, *name; - - name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1700,18 +1713,16 @@ - } - - static void --emft_get_folder_info__get (struct _mail_msg *mm) -+emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - -- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); -+ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); - } - - static void --emft_get_folder_info__got (struct _mail_msg *mm) -+emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - struct _EMFolderTreePrivate *priv = m->emft->priv; - struct _EMFolderTreeModelStoreInfo *si; - GtkTreeIter root, iter; -@@ -1739,7 +1750,7 @@ - gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); - - /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ -- if (!m->fi && camel_exception_is_set(&mm->ex)) { -+ if (!m->fi && camel_exception_is_set(&m->base.ex)) { - gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); - gtk_tree_view_collapse_row (priv->treeview, path); - gtk_tree_path_free (path); -@@ -1794,10 +1805,8 @@ - } - - static void --emft_get_folder_info__free (struct _mail_msg *mm) -+emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - - gtk_tree_row_reference_free (m->root); -@@ -1806,11 +1815,12 @@ - g_free (m->top); - } - --static struct _mail_msg_op get_folder_info_op = { -- emft_get_folder_info__desc, -- emft_get_folder_info__get, -- emft_get_folder_info__got, -- emft_get_folder_info__free, -+static MailMsgInfo get_folder_info_info = { -+ sizeof (struct _EMFolderTreeGetFolderInfo), -+ (MailMsgDescFunc) emft_get_folder_info__desc, -+ (MailMsgExecFunc) emft_get_folder_info__exec, -+ (MailMsgDoneFunc) emft_get_folder_info__done, -+ (MailMsgFreeFunc) emft_get_folder_info__free - }; - - static void -@@ -1897,7 +1907,7 @@ - - gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); - -- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); -+ m = mail_msg_new (&get_folder_info_info); - m->root = gtk_tree_row_reference_new (model, tree_path); - camel_object_ref (store); - m->store = store; -@@ -1906,7 +1916,7 @@ - m->top = full_name; - m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static gboolean ---- evolution-2.11.92/mail/em-folder-browser.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-04 00:19:08.000000000 -0400 -@@ -851,7 +851,7 @@ - - - struct _setup_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *query; -@@ -859,16 +859,15 @@ - GList *sources_folder; - }; - --static char * --vfolder_setup_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_setup_desc(struct _setup_msg *m) - { - return g_strdup(_("Searching")); - } - - static void --vfolder_setup_do(struct _mail_msg *mm) -+vfolder_setup_exec(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l, *list = NULL; - CamelFolder *folder; - -@@ -879,12 +878,12 @@ - l = m->sources_uri; - while (l) { - d(printf(" Adding uri: %s\n", (char *)l->data)); -- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); - if (folder) { - list = g_list_append(list, folder); - } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); -- camel_exception_clear(&mm->ex); -+ camel_exception_clear(&m->base.ex); - } - l = l->next; - } -@@ -908,17 +907,13 @@ - } - - static void --vfolder_setup_done(struct _mail_msg *mm) -+vfolder_setup_done(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- -- m = m; - } - - static void --vfolder_setup_free (struct _mail_msg *mm) -+vfolder_setup_free (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l; - - camel_object_unref(m->folder); -@@ -939,11 +934,12 @@ - g_list_free(m->sources_folder); - } - --static struct _mail_msg_op vfolder_setup_op = { -- vfolder_setup_desc, -- vfolder_setup_do, -- vfolder_setup_done, -- vfolder_setup_free, -+static MailMsgInfo vfolder_setup_info = { -+ sizeof (struct _setup_msg), -+ (MailMsgDescFunc) vfolder_setup_desc, -+ (MailMsgExecFunc) vfolder_setup_exec, -+ (MailMsgDoneFunc) vfolder_setup_done, -+ (MailMsgFreeFunc) vfolder_setup_free - }; - - /* sources_uri should be camel uri's */ -@@ -953,15 +949,15 @@ - struct _setup_msg *m; - int id; - -- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_setup_info); - m->folder = folder; - camel_object_ref(folder); - m->query = g_strdup(query); - m->sources_uri = sources_uri; - m->sources_folder = sources_folder; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } ---- evolution-2.11.92/mail/em-sync-stream.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-sync-stream.c 2007-09-04 00:19:08.000000000 -0400 +diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/mail/em-sync-stream.c +--- evolution-2.21.1/mail/em-sync-stream.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-sync-stream.c 2007-10-29 14:47:20.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -5217,7 +3947,7 @@ enum _write_msg_t { EMSS_WRITE, EMSS_FLUSH, -@@ -68,275 +43,168 @@ +@@ -68,275 +43,168 @@ enum _write_msg_t { }; struct _write_msg { @@ -5595,348 +4325,342 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.92/mail/importers/pine-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 -+++ evolution-2.11.92/mail/importers/pine-importer.c 2007-09-04 00:19:08.000000000 -0400 -@@ -56,7 +56,7 @@ - #define d(x) x +diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21.1/mail/em-subscribe-editor.c +--- evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-subscribe-editor.c 2007-10-29 14:47:20.000000000 -0400 +@@ -173,7 +173,7 @@ sub_unref(EMSubscribe *sub) + /* ** Subscribe folder operation **************************************** */ - struct _pine_import_msg { + struct _zsubscribe_msg { - struct _mail_msg msg; + MailMsg base; - EImport *import; - EImportTarget *target; -@@ -223,8 +223,8 @@ - g_object_unref(book); - } - --static char * --pine_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+pine_import_desc (struct _pine_import_msg *m) - { - return g_strdup (_("Importing Pine data")); - } -@@ -236,10 +236,8 @@ + EMSubscribe *sub; + EMSubscribeNode *node; +@@ -182,20 +182,18 @@ struct _zsubscribe_msg { }; - static void --pine_import_import(struct _mail_msg *mm) -+pine_import_exec(struct _pine_import_msg *m) + static void +-sub_folder_subscribe (struct _mail_msg *mm) ++sub_folder_exec (struct _zsubscribe_msg *m) { -- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; - - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) - import_contacts(); - -@@ -253,13 +251,11 @@ - } - - static void --pine_import_imported(struct _mail_msg *mm) -+pine_import_done(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - printf("importing complete\n"); - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -274,10 +270,8 @@ - } - - static void --pine_import_free(struct _mail_msg *mm) -+pine_import_free(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -326,11 +320,12 @@ - return TRUE; - } - --static struct _mail_msg_op pine_import_op = { -- pine_import_describe, -- pine_import_import, -- pine_import_imported, -- pine_import_free, -+static MailMsgInfo pine_import_info = { -+ sizeof (struct _pine_import_msg), -+ (MailMsgDescFunc) pine_import_desc, -+ (MailMsgExecFunc) pine_import_exec, -+ (MailMsgDoneFunc) pine_import_done, -+ (MailMsgFreeFunc) pine_import_free - }; - - static int -@@ -339,7 +334,7 @@ - struct _pine_import_msg *m; - int id; - -- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&pine_import_info); - g_datalist_set_data(&target->data, "pine-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -348,9 +343,9 @@ - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(pine_status, m); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } ---- evolution-2.11.92/mail/importers/mail-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 -+++ evolution-2.11.92/mail/importers/mail-importer.c 2007-09-04 00:19:08.000000000 -0400 -@@ -132,7 +132,7 @@ - } - - struct _import_mbox_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *path; - char *uri; -@@ -142,8 +142,8 @@ - void *done_data; - }; - --static char * --import_mbox_describe(struct _mail_msg *mm, int complete) -+static gchar * -+import_mbox_desc (struct _import_mbox_msg *m) - { - return g_strdup (_("Importing mailbox")); - } -@@ -190,9 +190,8 @@ - } - - static void --import_mbox_import(struct _mail_msg *mm) -+import_mbox_exec (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; - CamelFolder *folder; - CamelMimeParser *mp = NULL; - struct stat st; -@@ -207,7 +206,7 @@ - if (m->uri == NULL || m->uri[0] == 0) - folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); + if (m->subscribe) +- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); else -- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); -+ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); +- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); + } - if (folder == NULL) + static void +-sub_folder_subscribed (struct _mail_msg *mm) ++sub_folder_done (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; ++ struct _zsubscribe_msg *next; + GtkTreeIter iter; + GtkTreeModel *model; + EMSubscribeNode *node; +@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg + if (m->sub->cancel) return; -@@ -262,11 +261,11 @@ - flags |= decode_status(tmp); - - camel_message_info_set_flags(info, flags, ~0); -- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); -+ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); - camel_message_info_free(info); - camel_object_unref(msg); - -- if (camel_exception_is_set(&mm->ex)) -+ if (camel_exception_is_set(&m->base.ex)) - break; - - camel_mime_parser_step(mp, 0, 0); -@@ -286,30 +285,27 @@ - } - - static void --import_mbox_done(struct _mail_msg *mm) -+import_mbox_done (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->done) -- m->done(m->done_data, &mm->ex); -+ m->done(m->done_data, &m->base.ex); - } - - static void --import_mbox_free (struct _mail_msg *mm) -+import_mbox_free (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->cancel) - camel_operation_unref(m->cancel); - g_free(m->uri); - g_free(m->path); - } - --static struct _mail_msg_op import_mbox_op = { -- import_mbox_describe, -- import_mbox_import, -- import_mbox_done, -- import_mbox_free, -+static MailMsgInfo import_mbox_info = { -+ sizeof (struct _import_mbox_msg), -+ (MailMsgDescFunc) import_mbox_desc, -+ (MailMsgExecFunc) import_mbox_exec, -+ (MailMsgDoneFunc) import_mbox_done, -+ (MailMsgFreeFunc) import_mbox_free - }; - - int -@@ -318,7 +314,7 @@ - struct _import_mbox_msg *m; - int id; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - m->done = done; -@@ -328,8 +324,8 @@ - camel_operation_ref(cancel); - } - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_fast_ordered_push (m); - - return id; - } -@@ -339,7 +335,7 @@ - { - struct _import_mbox_msg *m; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - if (cancel) { -@@ -347,9 +343,9 @@ - camel_operation_ref(cancel); - } - -- import_mbox_import(&m->msg); -- import_mbox_done(&m->msg); -- mail_msg_free(&m->msg); -+ import_mbox_exec(&m->base); -+ import_mbox_done(&m->base); -+ mail_msg_unref(m); - } - - struct _import_folders_data { ---- evolution-2.11.92/mail/importers/elm-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 -+++ evolution-2.11.92/mail/importers/elm-importer.c 2007-09-04 00:19:08.000000000 -0400 -@@ -51,7 +51,7 @@ - #define d(x) x - - struct _elm_import_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EImport *import; - EImportTargetHome *target; -@@ -186,8 +186,8 @@ - return mailexists; - } - --static char * --elm_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+elm_import_desc (struct _elm_import_msg *m) - { - return g_strdup (_("Importing Elm data")); - } -@@ -198,9 +198,8 @@ - }; - - static void --elm_import_import(struct _mail_msg *mm) -+elm_import_exec (struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; - const char *maildir; - char *elmdir; - -@@ -218,13 +217,11 @@ - } - - static void --elm_import_imported(struct _mail_msg *mm) -+elm_import_done(struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; -- - printf("importing complete\n"); - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -236,10 +233,8 @@ + if (m->subscribe) + m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; + else +@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg + /* queue any further ones, or if out, update the ui */ + next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); + if (next) { +- next->sub->subscribe_id = next->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)next); ++ next->sub->subscribe_id = next->base.seq; ++ mail_msg_unordered_push (next); + } else { + /* should it go off the model instead? */ + sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); +@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg } - static void --elm_import_free(struct _mail_msg *mm) -+elm_import_free(struct _elm_import_msg *m) + static void +-sub_folder_free (struct _mail_msg *mm) ++sub_folder_free (struct _zsubscribe_msg *m) { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; - - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -288,11 +283,12 @@ - return TRUE; + g_free(m->path); + sub_unref(m->sub); } --static struct _mail_msg_op elm_import_op = { -- elm_import_describe, -- elm_import_import, -- elm_import_imported, -- elm_import_free, -+static MailMsgInfo elm_import_info = { -+ sizeof (struct _elm_import_msg), -+ (MailMsgDescFunc) elm_import_desc, -+ (MailMsgExecFunc) elm_import_exec, -+ (MailMsgDoneFunc) elm_import_done, -+ (MailMsgFreeFunc) elm_import_free +-static struct _mail_msg_op sub_subscribe_folder_op = { +- NULL, /*subscribe_folder_desc,*/ +- sub_folder_subscribe, +- sub_folder_subscribed, +- sub_folder_free, ++static MailMsgInfo sub_subscribe_folder_info = { ++ sizeof (struct _zsubscribe_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folder_exec, ++ (MailMsgDoneFunc) sub_folder_done, ++ (MailMsgFreeFunc) sub_folder_free }; - static int -@@ -301,7 +297,7 @@ - struct _elm_import_msg *m; + /* spath is tree path in string form */ +@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, + struct _zsubscribe_msg *m; int id; -- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&elm_import_info); - g_datalist_set_data(&target->data, "elm-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -310,9 +306,9 @@ - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(elm_status, m); +- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_subscribe_folder_info); + m->sub = sub; + sub_ref(sub); + m->node = node; + m->subscribe = state; + m->path = g_strdup(spath); - id = m->msg.seq; + id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); + if (sub->subscribe_id == -1) { + sub->subscribe_id = id; + d(printf("running subscribe folder '%s'\n", spath)); +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); + } else { + d(printf("queueing subscribe folder '%s'\n", spath)); + e_dlist_addtail(&sub->subscribe, (EDListNode *)m); +@@ -339,7 +336,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo + /* async query of folderinfo */ + struct _emse_folderinfo_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int seq; + +@@ -349,31 +346,29 @@ struct _emse_folderinfo_msg { + }; + + static void +-sub_folderinfo_get (struct _mail_msg *mm) ++sub_folderinfo_exec (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + char *pub_full_name=NULL; + + if (m->seq == m->sub->seq) { +- camel_operation_register(mm->cancel); +- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); +- camel_operation_unregister(mm->cancel); ++ camel_operation_register(m->base.cancel); ++ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); ++ camel_operation_unregister(m->base.cancel); + } + } + + static void +-sub_folderinfo_got(struct _mail_msg *mm) ++sub_folderinfo_done (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + EMSubscribeNode *node; + + m->sub->pending_id = -1; + if (m->sub->cancel || m->seq != m->sub->seq) + return; + +- if (camel_exception_is_set (&mm->ex)) { ++ if (camel_exception_is_set (&m->base.ex)) { + g_warning ("Error getting folder info from store: %s", +- camel_exception_get_description (&mm->ex)); ++ camel_exception_get_description (&m->base.ex)); + } + + if (m->info) { +@@ -394,10 +389,8 @@ sub_folderinfo_got(struct _mail_msg *mm) + } + + static void +-sub_folderinfo_free(struct _mail_msg *mm) ++sub_folderinfo_free (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; +- + if (m->info) + m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); + +@@ -413,11 +406,12 @@ sub_folderinfo_free(struct _mail_msg *mm + sub_unref(m->sub); + } + +-static struct _mail_msg_op sub_folderinfo_op = { +- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ +- sub_folderinfo_get, +- sub_folderinfo_got, +- sub_folderinfo_free, ++static MailMsgInfo sub_folderinfo_info = { ++ sizeof (struct _emse_folderinfo_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folderinfo_exec, ++ (MailMsgDoneFunc) sub_folderinfo_done, ++ (MailMsgFreeFunc) sub_folderinfo_free + }; + + static int +@@ -429,19 +423,19 @@ sub_queue_fill_level(EMSubscribe *sub, E + d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, + node?node->info->full_name:"")); + +- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_folderinfo_info); + sub_ref(sub); + m->sub = sub; + m->node = node; + m->seq = sub->seq; + +- sub->pending_id = m->msg.seq; ++ sub->pending_id = m->base.seq; + + sub_editor_busy(sub->editor, 1); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); return id; } ---- evolution-2.11.92/mail/mail-ops.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-ops.h 2007-09-04 00:19:08.000000000 -0400 -@@ -30,13 +30,14 @@ + +@@ -571,7 +565,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s + mail_msg_cancel(sub->subscribe_id); + + while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) +- mail_msg_free(m); ++ mail_msg_unref(m); + + sub_unref(sub); + } +diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail-mt.h +--- evolution-2.21.1/mail/mail-mt.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-mt.h 2007-10-29 14:47:20.000000000 -0400 +@@ -23,47 +23,64 @@ + #ifndef _MAIL_MT + #define _MAIL_MT + +-#include + #include "camel/camel-exception.h" +-#include "libedataserver/e-msgport.h" + #include "camel/camel-object.h" + #include "camel/camel-operation.h" + +-typedef struct _mail_msg { +- EMsg msg; /* parent type */ +- struct _mail_msg_op *ops; /* operation functions */ ++typedef struct _MailMsg MailMsg; ++typedef struct _MailMsgInfo MailMsgInfo; ++typedef struct _MailMsgPrivate MailMsgPrivate; ++ ++typedef gchar * (*MailMsgDescFunc) (MailMsg *msg); ++typedef void (*MailMsgExecFunc) (MailMsg *msg); ++typedef void (*MailMsgDoneFunc) (MailMsg *msg); ++typedef void (*MailMsgFreeFunc) (MailMsg *msg); ++typedef void (*MailMsgDispatchFunc) (gpointer msg); ++ ++struct _MailMsg { ++ MailMsgInfo *info; ++ volatile gint ref_count; + unsigned int seq; /* seq number for synchronisation */ ++ gint priority; /* priority (default = 0) */ + CamelOperation *cancel; /* a cancellation/status handle */ + CamelException ex; /* an initialised camel exception, upto the caller to use this */ +- struct _mail_msg_priv *priv; /* private for internal use */ +-} mail_msg_t; ++ MailMsgPrivate *priv; ++}; + +-/* callback functions for thread message */ +-typedef struct _mail_msg_op { +- char *(*describe_msg)(struct _mail_msg *msg, int complete); +- +- void (*receive_msg)(struct _mail_msg *msg); /* message received */ +- void (*reply_msg)(struct _mail_msg *msg); /* message replied */ +- void (*destroy_msg)(struct _mail_msg *msg); /* finalise message */ +-} mail_msg_op_t; ++struct _MailMsgInfo { ++ gsize size; ++ MailMsgDescFunc desc; ++ MailMsgExecFunc exec; ++ MailMsgDoneFunc done; ++ MailMsgFreeFunc free; ++}; + + /* setup ports */ + void mail_msg_init(void); + void mail_msg_cleanup (void); + ++gboolean mail_in_main_thread (void); ++ + /* allocate a new message */ +-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); +-void mail_msg_free(void *msg); +-void mail_msg_check_error(void *msg); ++gpointer mail_msg_new (MailMsgInfo *info); ++gpointer mail_msg_ref (gpointer msg); ++void mail_msg_unref (gpointer msg); ++void mail_msg_check_error (gpointer msg); + void mail_msg_cancel(unsigned int msgid); + void mail_msg_wait(unsigned int msgid); + void mail_msg_wait_all(void); + int mail_msg_active(unsigned int msgid); + ++/* dispatch a message */ ++void mail_msg_main_loop_push (gpointer msg); ++void mail_msg_unordered_push (gpointer msg); ++void mail_msg_fast_ordered_push (gpointer msg); ++void mail_msg_slow_ordered_push (gpointer msg); ++ + /* To implement the stop button */ +-void *mail_cancel_hook_add(GDestroyNotify func, void *data); +-void mail_cancel_hook_remove(void *handle); +-void mail_cancel_all(void); ++GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); ++void mail_cancel_hook_remove (GHook *hook); ++void mail_cancel_all (void); + + /* request a string/password */ + char *mail_get_password (CamelService *service, const char *prompt, +@@ -112,24 +129,6 @@ void *mail_call_main(mail_call_t type, M + void mail_enable_stop(void); + void mail_disable_stop(void); + +-/* a message port that receives messages in the gui thread, used for sending port */ +-extern EMsgPort *mail_gui_port; +-/* a message port that receives messages in the gui thread, used for the reply port */ +-extern EMsgPort *mail_gui_reply_port; +- +-/* some globally available threads */ +-#ifndef G_OS_WIN32 +-extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */ +-#else +-EThread *mail_win32_get_mail_thread_queued (void); +-#define mail_thread_queued mail_win32_get_mail_thread_queued () +-#endif +-extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */ +-extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ +- +-/* The main thread. */ +-extern pthread_t mail_gui_thread; +- + /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ + /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ + extern MailAsyncEvent *mail_async_event; +diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mail-ops.h +--- evolution-2.21.1/mail/mail-ops.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-ops.h 2007-10-29 14:47:20.000000000 -0400 +@@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -5952,7 +4676,7 @@ #include "libedataserver/e-account.h" void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, -@@ -55,12 +56,12 @@ +@@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder void mail_get_message (CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), void *data, @@ -5967,7 +4691,7 @@ /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +71,7 @@ +@@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol /* same for a folder */ int mail_get_folder (const char *uri, guint32 flags, void (*done) (char *uri, CamelFolder *folder, void *data), void *data, @@ -5976,20 +4700,87 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.92/mail/em-utils.c.kill-ethread 2007-09-04 00:19:00.000000000 -0400 -+++ evolution-2.11.92/mail/em-utils.c 2007-09-04 00:19:08.000000000 -0400 -@@ -1912,7 +1912,7 @@ - ESource *source = s->data; - GList *contacts; - EBook *book; -- void *hook; -+ GHook *hook; +diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1/mail/em-composer-utils.c +--- evolution-2.21.1/mail/em-composer-utils.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-composer-utils.c 2007-10-29 14:47:20.000000000 -0400 +@@ -557,7 +557,7 @@ em_utils_composer_save_draft_cb (EMsgCom + strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { + int id; + +- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); ++ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); + mail_msg_wait (id); + + if (!folder || !account->enabled) { +@@ -1108,7 +1108,7 @@ em_utils_redirect_message_by_uid (CamelF + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); ++ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); + } - d(printf(" checking '%s'\n", e_source_get_uri(source))); + static void +@@ -1139,7 +1139,7 @@ em_utils_handle_receipt (CamelFolder *fo + } ---- evolution-2.11.92/mail/mail-folder-cache.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-folder-cache.c 2007-09-04 00:19:08.000000000 -0400 -@@ -862,15 +862,14 @@ + if (msg == NULL) { +- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); ++ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); + camel_message_info_free(info); + return; + } +@@ -1953,7 +1953,7 @@ em_utils_reply_to_message(CamelFolder *f + rd->source = source; + if (rd->source) + g_object_ref(rd->source); +- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); ++ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); + + return; + } +@@ -2125,5 +2125,5 @@ em_utils_post_reply_to_message_by_uid (C + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); ++ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); + } +diff -up evolution-2.21.1/mail/em-filter-i18n.h.kill-ethread evolution-2.21.1/mail/em-filter-i18n.h +--- evolution-2.21.1/mail/em-filter-i18n.h.kill-ethread 2007-10-29 03:19:19.000000000 -0400 ++++ evolution-2.21.1/mail/em-filter-i18n.h 2007-10-29 14:47:20.000000000 -0400 +@@ -3,7 +3,10 @@ char *s = N_("Adjust Score"); + char *s = N_("Assign Color"); + char *s = N_("Assign Score"); + char *s = N_("Attachments"); ++char *s = N_("BCC"); + char *s = N_("Beep"); ++char *s = N_("CC"); ++char *s = N_("Completed On"); + char *s = N_("contains"); + char *s = N_("Copy to Folder"); + char *s = N_("Date received"); +@@ -32,6 +35,8 @@ char *s = N_("is greater than"); + char *s = N_("is less than"); + char *s = N_("is not"); + char *s = N_("is not Flagged"); ++char *s = N_("is not set"); ++char *s = N_("is set"); + char *s = N_("Junk"); + char *s = N_("Junk Test"); + char *s = N_("Label"); +@@ -54,6 +59,7 @@ char *s = N_("returns less than"); + char *s = N_("Run Program"); + char *s = N_("Score"); + char *s = N_("Sender"); ++char *s = N_("Set Label"); + char *s = N_("Set Status"); + char *s = N_("Size (kB)"); + char *s = N_("sounds like"); +diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1/mail/mail-folder-cache.c +--- evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-folder-cache.c 2007-10-29 14:47:20.000000000 -0400 +@@ -866,15 +866,14 @@ update_folders(CamelStore *store, CamelF struct _ping_store_msg { @@ -6008,7 +4799,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -881,10 +880,9 @@ +@@ -885,10 +884,9 @@ ping_store_desc (struct _mail_msg *mm, i } static void @@ -6020,7 +4811,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -895,22 +893,21 @@ +@@ -899,22 +897,21 @@ ping_store_ping (struct _mail_msg *mm) online = TRUE; } if (online) @@ -6051,7 +4842,7 @@ }; static void -@@ -922,11 +919,11 @@ +@@ -926,11 +923,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -6065,7 +4856,7 @@ } static gboolean -@@ -971,7 +968,7 @@ +@@ -975,7 +972,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; g_return_if_fail (CAMEL_IS_STORE(store)); @@ -6074,53 +4865,355 @@ LOCK(info_lock); ---- evolution-2.11.92/mail/em-composer-utils.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/em-composer-utils.c 2007-09-04 00:19:08.000000000 -0400 -@@ -553,7 +553,7 @@ - strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; - -- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); -+ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); - mail_msg_wait (id); - - if (!folder || !account->enabled) { -@@ -1104,7 +1104,7 @@ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); -+ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); +diff -up evolution-2.21.1/mail/em-folder-view.c.kill-ethread evolution-2.21.1/mail/em-folder-view.c +--- evolution-2.21.1/mail/em-folder-view.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/em-folder-view.c 2007-10-29 14:47:20.000000000 -0400 +@@ -71,6 +71,7 @@ + #include + + #include ++#include + + #include "menus/gal-view-etable.h" + #include "menus/gal-view-factory-etable.h" +@@ -777,7 +778,7 @@ emfv_got_folder(char *uri, CamelFolder * + static void + emfv_set_folder_uri(EMFolderView *emfv, const char *uri) + { +- mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); ++ mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); } static void -@@ -1135,7 +1135,7 @@ - } - - if (msg == NULL) { -- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); -+ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); - camel_message_info_free(info); - return; - } -@@ -1949,7 +1949,7 @@ - rd->source = source; - if (rd->source) - g_object_ref(rd->source); -- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); -+ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - - return; - } -@@ -2121,5 +2121,5 @@ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); +@@ -1752,7 +1753,7 @@ filter_type_uid (CamelFolder *folder, co + data->type = type; + data->source = source; -- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); -+ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); +- mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); ++ mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); } ---- evolution-2.11.92/mail/mail-mt.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/mail/mail-mt.c 2007-09-04 00:19:08.000000000 -0400 + + static void +@@ -1850,7 +1851,7 @@ vfolder_type_uid (CamelFolder *folder, c + data->type = type; + data->uri = g_strdup (uri); + +- mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); ++ mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); + } + + static void +@@ -2427,7 +2428,7 @@ emfv_message_selected_timeout(void *data + emfv->displayed_uid); + gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); + */ +- mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); ++ mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); + } else { + e_profile_event_emit("goto.empty", "", 0); + g_free(emfv->priv->selected_uid); +diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail/mail-session.c +--- evolution-2.21.1/mail/mail-session.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-session.c 2007-10-29 14:47:20.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + + #include +-#include ++#include + + #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ + #include +@@ -264,148 +264,145 @@ forget_password (CamelSession *session, + + /* ********************************************************************** */ + +-static GtkDialog *message_dialog; +-static EDList message_list = E_DLIST_INITIALISER(message_list); ++static gpointer user_message_dialog; ++static GQueue user_message_queue = { NULL, NULL, 0 }; + + struct _user_message_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelSessionAlertType type; + char *prompt; ++ EFlag *done; + + unsigned int allow_cancel:1; + unsigned int result:1; + unsigned int ismain:1; + }; + +-static void do_user_message (struct _mail_msg *mm); ++static void user_message_exec (struct _user_message_msg *m); + + /* clicked, send back the reply */ + static void + user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) + { + gtk_widget_destroy ((GtkWidget *) dialog); +- +- message_dialog = NULL; +- ++ ++ user_message_dialog = NULL; ++ + /* if !allow_cancel, then we've already replied */ + if (m->allow_cancel) { + m->result = button == GTK_RESPONSE_OK; +- e_msgport_reply((EMsg *)m); ++ e_flag_set (m->done); + } + + /* check for pendings */ +- if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) +- do_user_message((struct _mail_msg *)m); +-} +- +-static void +-user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef) +-{ +- message_dialog = NULL; ++ if (!g_queue_is_empty (&user_message_queue)) { ++ m = g_queue_pop_head (&user_message_queue); ++ user_message_exec (m); ++ mail_msg_unref (m); ++ } + } + +-/* This is kinda ugly/inefficient, but oh well, it works */ +-static const char *error_type[] = { +- "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", +- "mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel" +-}; +- + static void +-do_user_message (struct _mail_msg *mm) ++user_message_exec (struct _user_message_msg *m) + { +- struct _user_message_msg *m = (struct _user_message_msg *)mm; +- int type; ++ const gchar *error_type; + +- if (!m->ismain && message_dialog != NULL) { +- e_dlist_addtail (&message_list, (EDListNode *)m); ++ if (!m->ismain && user_message_dialog != NULL) { ++ g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); + return; + } + + switch (m->type) { +- case CAMEL_SESSION_ALERT_INFO: +- type = 0; +- break; +- case CAMEL_SESSION_ALERT_WARNING: +- type = 1; +- break; +- case CAMEL_SESSION_ALERT_ERROR: +- type = 2; +- break; +- default: +- type = 0; +- } +- +- if (m->allow_cancel) +- type += 3; +- +- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); +- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); +- +- /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ +- if (m->allow_cancel) { +- if (m->ismain) { +- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); +- } else { +- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); +- gtk_widget_show ((GtkWidget *) message_dialog); +- } ++ case CAMEL_SESSION_ALERT_INFO: ++ error_type = m->allow_cancel ? ++ "mail:session-message-info-cancel" : ++ "mail:session-message-info"; ++ break; ++ case CAMEL_SESSION_ALERT_WARNING: ++ error_type = m->allow_cancel ? ++ "mail:session-message-warning-cancel" : ++ "mail:session-message-warning"; ++ break; ++ case CAMEL_SESSION_ALERT_ERROR: ++ error_type = m->allow_cancel ? ++ "mail:session-message-error-cancel" : ++ "mail:session-message-error"; ++ break; ++ default: ++ g_assert_not_reached (); ++ } ++ ++ user_message_dialog = e_error_new (NULL, error_type, m->prompt, NULL); ++ g_object_set ( ++ user_message_dialog, "allow_shrink", TRUE, ++ "allow_grow", TRUE, NULL); ++ ++ /* We only need to wait for the result if we allow cancel ++ * otherwise show but send result back instantly */ ++ if (m->allow_cancel && m->ismain) { ++ gint response = gtk_dialog_run (user_message_dialog); ++ user_message_response (user_message_dialog, response, m); + } else { +- g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); +- g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); +- gtk_widget_show ((GtkWidget *) message_dialog); +- mail_msg_free(m); ++ g_signal_connect ( ++ user_message_dialog, "response", ++ G_CALLBACK (user_message_response), m); ++ gtk_widget_show (user_message_dialog); + } + } + + static void +-free_user_message(struct _mail_msg *mm) ++user_message_free (struct _user_message_msg *m) + { +- struct _user_message_msg *m = (struct _user_message_msg *)mm; +- + g_free(m->prompt); ++ e_flag_free(m->done); + } + +-static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; ++static MailMsgInfo user_message_info = { ++ sizeof (struct _user_message_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) user_message_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) user_message_free ++}; + + static gboolean + alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) + { + MailSession *mail_session = MAIL_SESSION (session); +- struct _user_message_msg *m, *r; +- EMsgPort *user_message_reply = NULL; +- gboolean ret; ++ struct _user_message_msg *m; ++ gboolean result = TRUE; + + if (!mail_session->interactive) + return FALSE; + +- if (cancel) +- user_message_reply = e_msgport_new (); +- m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); +- m->ismain = pthread_equal(pthread_self(), mail_gui_thread); ++ m = mail_msg_new (&user_message_info); ++ m->ismain = mail_in_main_thread (); + m->type = type; +- m->prompt = g_strdup(prompt); ++ m->prompt = g_strdup (prompt); ++ m->done = e_flag_new (); + m->allow_cancel = cancel; + +- if (m->ismain) +- do_user_message((struct _mail_msg *)m); +- else { +- extern EMsgPort *mail_gui_port2; ++ if (cancel) ++ mail_msg_ref (m); + +- e_msgport_put(mail_gui_port2, (EMsg *)m); +- } ++ if (m->ismain) ++ user_message_exec (m); ++ else ++ mail_msg_main_loop_push (m); + + if (cancel) { +- r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); +- g_return_val_if_fail (m == r, FALSE); ++ e_flag_wait (m->done); ++ result = m->result; ++ mail_msg_unref (m); ++ } + +- ret = m->result; +- mail_msg_free(m); +- e_msgport_destroy(user_message_reply); +- } else +- ret = TRUE; ++ if (m->ismain) { ++ user_message_free (m); ++ mail_msg_unref (m); ++ } + +- return ret; ++ return result; + } + + static CamelFolder * +@@ -541,7 +538,7 @@ get_filter_driver (CamelSession *session + /* TODO: This is very temporary, until we have a better way to do the progress reporting, + we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ + +-static mail_msg_op_t ms_thread_ops_dummy = { NULL }; ++static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; + + static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) + { +@@ -550,7 +547,7 @@ static void *ms_thread_msg_new(CamelSess + /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so + we get cancellation and progress in common with hte existing mail code, for free */ + if (msg) { +- struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); ++ MailMsg *m = mail_msg_new(&ms_thread_info_dummy); + + msg->data = m; + camel_operation_unref(msg->op); +@@ -563,7 +560,7 @@ static void *ms_thread_msg_new(CamelSess + + static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) + { +- mail_msg_free(m->data); ++ mail_msg_unref(m->data); + ms_parent_class->thread_msg_free(session, m); + } + +@@ -686,22 +683,23 @@ mail_session_set_interactive (gboolean i + MAIL_SESSION (session)->interactive = interactive; + + if (!interactive) { +- struct _user_message_msg *um; ++ struct _user_message_msg *msg; + + d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); + + e_passwords_cancel(); + + /* flush/cancel pending user messages */ +- while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { +- d(printf ("Flusing message request: %s\n", um->prompt)); +- e_msgport_reply((EMsg *) um); ++ while (!g_queue_is_empty (&user_message_queue)) { ++ msg = g_queue_pop_head (&user_message_queue); ++ e_flag_set (msg->done); ++ mail_msg_unref (msg); + } + + /* and the current */ +- if (message_dialog) { ++ if (user_message_dialog) { + d(printf("Destroying message dialogue\n")); +- gtk_widget_destroy ((GtkWidget *) message_dialog); ++ gtk_widget_destroy ((GtkWidget *) user_message_dialog); + } + } + } +diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail-mt.c +--- evolution-2.21.1/mail/mail-mt.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/mail-mt.c 2007-10-29 14:47:20.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -6131,7 +5224,7 @@ #include #include -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ static void mail_operation_status(struct #endif /* background operation status stuff */ @@ -6140,7 +5233,7 @@ int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the pointer itself for locking/race conditions */ int activity_id; -@@ -82,15 +82,12 @@ +@@ -82,15 +82,12 @@ static GHashTable *mail_msg_active_table static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -6159,7 +5252,7 @@ MAIL_MT_LOCK(mail_msg_lock); -@@ -112,7 +109,6 @@ +@@ -112,7 +109,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E fprintf(log, "Logging async operations\n"); if (log_locks) { @@ -6167,7 +5260,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,13 +118,13 @@ +@@ -122,13 +118,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -6185,7 +5278,7 @@ g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); -@@ -143,12 +139,15 @@ +@@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } @@ -6204,7 +5297,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +176,93 @@ +@@ -177,58 +176,93 @@ checkmem(void *p) } #endif @@ -6326,7 +5419,7 @@ } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +278,10 @@ +@@ -244,9 +278,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } @@ -6339,7 +5432,7 @@ char *what; GtkDialog *gd; -@@ -271,27 +306,27 @@ +@@ -271,27 +306,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -6374,7 +5467,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +339,12 @@ +@@ -304,13 +339,12 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) @@ -6391,7 +5484,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +381,7 @@ +@@ -347,9 +381,7 @@ int mail_msg_active(unsigned int msgid) void mail_msg_wait_all(void) { @@ -6402,7 +5495,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +399,239 @@ +@@ -367,294 +399,239 @@ void mail_msg_wait_all(void) } /* **************************************** */ @@ -6716,12 +5809,12 @@ - checkmem(m->cancel); - checkmem(m->priv); -#endif -- -- if (m->ops->describe_msg) { -- char *text = m->ops->describe_msg(m, FALSE); + if (priority1 == priority2) + return 0; +- if (m->ops->describe_msg) { +- char *text = m->ops->describe_msg(m, FALSE); +- -#ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); @@ -6784,14 +5877,14 @@ + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); +} -+ + +- g_io_channel_unref(mail_gui_channel); +- g_io_channel_unref(mail_gui_reply_channel); +void +mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; - -- g_io_channel_unref(mail_gui_channel); -- g_io_channel_unref(mail_gui_reply_channel); ++ + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - e_msgport_destroy(mail_gui_port); @@ -6849,11 +5942,11 @@ - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); ++ + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); +} @@ -6865,7 +5958,7 @@ } /* ********************************************************************** */ -@@ -665,7 +642,8 @@ +@@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ struct _proxy_msg { @@ -6875,7 +5968,7 @@ MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +657,8 @@ +@@ -679,10 +657,8 @@ struct _proxy_msg { }; static void @@ -6887,7 +5980,7 @@ m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +673,17 @@ +@@ -697,16 +673,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); @@ -6911,7 +6004,7 @@ }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +700,9 @@ +@@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; @@ -6923,7 +6016,7 @@ m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +711,7 @@ +@@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; @@ -6932,7 +6025,7 @@ g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +719,12 @@ +@@ -743,12 +719,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -6948,7 +6041,7 @@ return id; } -@@ -762,7 +738,7 @@ +@@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -6957,7 +6050,7 @@ if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +760,18 @@ +@@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ struct _call_msg { @@ -6979,7 +6072,7 @@ void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +819,47 @@ +@@ -842,45 +819,47 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -7046,7 +6139,7 @@ return ret; } -@@ -889,40 +868,42 @@ +@@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; @@ -7101,7 +6194,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +911,7 @@ +@@ -930,7 +911,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ struct _op_status_msg { @@ -7110,7 +6203,7 @@ struct _CamelOperation *op; char *what; -@@ -938,16 +919,16 @@ +@@ -938,16 +919,16 @@ struct _op_status_msg { void *data; }; @@ -7132,31 +6225,33 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +967,8 @@ - progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); +@@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms + progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->ops->describe_msg) - what = msg->ops->describe_msg (msg, FALSE); + if (msg->info->desc) + what = msg->info->desc (msg); + else if (m->what) + what = g_strdup (m->what); /* uncommenting because message is not very useful for a user, see bug 271734*/ - else { - what = g_strdup(""); -@@ -1001,11 +982,7 @@ - MAIL_MT_LOCK (mail_msg_lock); - if (data->activity_state == 3) { +@@ -1004,13 +985,7 @@ static void do_op_status(struct _mail_ms + int activity_id = data->activity_id; + MAIL_MT_UNLOCK (mail_msg_lock); -- if (msg->cancel) +- if (msg->cancel) { +- camel_operation_mute (msg->cancel); - camel_operation_unref (msg->cancel); +- } - camel_exception_clear (&msg->ex); - g_free (msg->priv); - g_free (msg); + mail_msg_free (msg); - } else { - data->activity_state = 2; - MAIL_MT_UNLOCK (mail_msg_lock); -@@ -1021,18 +998,17 @@ + + if (activity_id != 0) + mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, +@@ -1030,18 +1005,17 @@ static void do_op_status(struct _mail_ms } static void @@ -7182,7 +6277,7 @@ }; static void -@@ -1042,7 +1018,7 @@ +@@ -1051,7 +1025,7 @@ mail_operation_status (struct _CamelOper d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -7191,7 +6286,7 @@ m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1031,7 @@ +@@ -1064,7 +1038,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; @@ -7200,3 +6295,1045 @@ } /* ******************** */ +diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c +--- evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-10-23 06:06:00.000000000 -0400 ++++ evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-10-29 14:47:20.000000000 -0400 +@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( + + + struct _folder_unsub_t { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + }; + +-static char * +-folder_unsubscribe__desc (struct _mail_msg *mm, int done) ++static gchar * ++folder_unsubscribe_desc (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); ++ return g_strdup_printf ( ++ _("Unsubscribing from folder \"%s\""), msg->uri); + } + + static void +-folder_unsubscribe__unsub (struct _mail_msg *mm) ++folder_unsubscribe_exec (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; + extern CamelSession *session; + const char *path = NULL; + CamelStore *store; + CamelURL *url; + +- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) ++ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) + return; + +- url = camel_url_new (unsub->uri, NULL); ++ url = camel_url_new (msg->uri, NULL); + if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) + path = url->fragment; + else if (url->path && url->path[0]) +@@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_ + } + + static void +-folder_unsubscribe__free (struct _mail_msg *mm) ++folder_unsubscribe_free (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- g_free (unsub->uri); ++ g_free (msg->uri); + } + +-static struct _mail_msg_op unsubscribe_op = { +- folder_unsubscribe__desc, +- folder_unsubscribe__unsub, +- NULL, +- folder_unsubscribe__free, ++static MailMsgInfo unsubscribe_info = { ++ sizeof (struct _folder_unsub_t), ++ (MailMsgDescFunc) folder_unsubscribe_desc, ++ (MailMsgExecFunc) folder_unsubscribe_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) folder_unsubscribe_free + }; + + +@@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug + if (target->uri == NULL) + return; + +- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); ++ unsub = mail_msg_new (&unsubscribe_info); + unsub->uri = g_strdup (target->uri); + +- e_thread_put (mail_thread_new, (EMsg *) unsub); ++ mail_msg_unordered_push (unsub); + } +diff -up evolution-2.21.1/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.21.1/plugins/mark-all-read/mark-all-read.c +--- evolution-2.21.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-10-23 06:06:03.000000000 -0400 ++++ evolution-2.21.1/plugins/mark-all-read/mark-all-read.c 2007-10-29 14:47:20.000000000 -0400 +@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM + return; + } + +- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); ++ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); + } + + static void +diff -up evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.21.1/plugins/exchange-operations/exchange-folder.c +--- evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-10-23 06:06:03.000000000 -0400 ++++ evolution-2.21.1/plugins/exchange-operations/exchange-folder.c 2007-10-29 14:47:20.000000000 -0400 +@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr + inbox_physical_uri = e_folder_get_physical_uri (inbox); + + /* To get the CamelStore/Folder */ +- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); ++ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); + + + } +diff -up evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.21.1/plugins/save-attachments/save-attachments.c +--- evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 ++++ evolution-2.21.1/plugins/save-attachments/save-attachments.c 2007-10-29 14:47:20.000000000 -0400 +@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin + camel_object_ref(data->folder); + data->uid = g_strdup(target->uids->pdata[0]); + +- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); ++ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); + } +diff -up evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c +--- evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-10-23 06:06:05.000000000 -0400 ++++ evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-10-29 14:47:20.000000000 -0400 +@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM + data->uri = strdup (sel->uri); + + mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), +- emla_list_action_do, data, mail_thread_new); ++ emla_list_action_do, data, mail_msg_unordered_push); + } + + void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) +diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread evolution-2.21.1/plugins/itip-formatter/itip-formatter.c +--- evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 ++++ evolution-2.21.1/plugins/itip-formatter/itip-formatter.c 2007-10-29 14:47:20.000000000 -0400 +@@ -1547,47 +1547,38 @@ extract_itip_data (FormatItipPObject *pi + } + + struct _opencal_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *command; /* command line to run */ + }; + + static char * +-open_calendar_desc (struct _mail_msg *mm, int done) ++open_calendar__desc (struct _opencal_msg *m, gint complete) + { + return g_strdup (_("Opening calendar")); + } + + static void +-open_calendar_do (struct _mail_msg *mm) ++open_calendar__exec (struct _opencal_msg *m) + { +- struct _opencal_msg *m = (struct _opencal_msg *)mm; +- + if (!g_spawn_command_line_async (m->command, NULL)) { + g_warning ("Could not launch %s", m->command); + } + } + + static void +-open_calendar_done (struct _mail_msg *mm) +-{ +- /*struct _opencal_msg *m = (struct _opencal_msg *)mm;*/ +-} +- +-static void +-open_calendar_free (struct _mail_msg *mm) ++open_calendar__free (struct _opencal_msg *m) + { +- struct _opencal_msg *m = (struct _opencal_msg *)mm; +- + g_free (m->command); + m->command = NULL; + } + +-static struct _mail_msg_op open_calendar_op = { +- open_calendar_desc, +- open_calendar_do, +- open_calendar_done, +- open_calendar_free, ++static MailMsgInfo open_calendar_info = { ++ sizeof (struct _opencal_msg), ++ (MailMsgDescFunc) open_calendar__desc, ++ (MailMsgExecFunc) open_calendar__exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) open_calendar__free, + }; + + static gboolean +@@ -1596,10 +1587,10 @@ idle_open_cb (gpointer data) + FormatItipPObject *pitip = data; + struct _opencal_msg *m; + +- m = mail_msg_new (&open_calendar_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&open_calendar_info); + m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", + isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time)); +- e_thread_put (mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push (m); + + return FALSE; + } +diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.21.1/plugins/groupwise-features/share-folder-common.c +--- evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-10-23 06:06:01.000000000 -0400 ++++ evolution-2.21.1/plugins/groupwise-features/share-folder-common.c 2007-10-29 14:47:20.000000000 -0400 +@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi + } + + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -137,31 +137,26 @@ struct _EMCreateFolder { + void *user_data; + }; + +-static char * +-create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++create_folder_desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-create_folder__create (struct _mail_msg *mm) ++create_folder_exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-create_folder__created (struct _mail_msg *mm) ++create_folder_done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; + struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; + CamelStore *store = CAMEL_STORE (m->store) ; + EGwConnection *ccnc; +@@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg + } + + static void +-create_folder__free (struct _mail_msg *mm) ++create_folder_free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- create_folder__desc, +- create_folder__create, +- create_folder__created, +- create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) create_folder_desc, ++ (MailMsgExecFunc) create_folder_exec, ++ (MailMsgDoneFunc) create_folder_done, ++ (MailMsgFreeFunc) create_folder_free + }; + + static void +@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const + parent = namebuf; + } + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const + m->user_data = (struct ShareInfo *) user_data; + m->done = done; + g_free (namebuf); +- id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); + + return id; + } +diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h +--- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-10-23 06:12:51.000000000 -0400 ++++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h 2007-10-29 14:47:20.000000000 -0400 +@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo + + typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; + +-typedef struct _AlarmMsg AlarmMsg; +-typedef struct _AlarmMsgPrivate AlarmMsgPrivate; +- +-struct _AlarmMsg { +- EMsg msg; +- +- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ +- void *data; +- +- /* Private Usage */ +- struct _AlarmMsgPrivate *priv; +-}; +- + struct _AlarmNotify { + BonoboObject object; + +diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c +--- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 ++++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c 2007-10-29 14:47:20.000000000 -0400 +@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { + GMutex *mutex; + }; + +-EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ +-EMsgPort *alarm_reply_port; +-static GIOChannel *alarm_reply_channel; +- + #define d(x) x + + +@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) + g_mutex_free (priv->mutex); + g_free (priv); + +- e_thread_destroy(alarm_operation_thread); +- g_io_channel_unref(alarm_reply_channel); +- e_msgport_destroy(alarm_reply_port); + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); + } + + + +-static guint +-alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +-{ +- GSource *source; +- guint id; +- +- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); +- *port = e_msgport_new(); +-#ifndef G_OS_WIN32 +- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); +-#else +- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); +-#endif +- source = g_io_create_watch(*channel, G_IO_IN); +- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); +- g_source_set_can_recurse(source, FALSE); +- id = g_source_attach(source, NULL); +- g_source_unref(source); +- +- return id; +-} +- +-static void +-alarm_msg_destroy(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- /* Free the private */ +- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ +- g_free (m); +-} +- +-static gboolean +-alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) +-{ +- EMsgPort *port = (EMsgPort *)d; +- EMsg *m; +- +- while (( m = e_msgport_get(port))) { +- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); +- alarm_msg_destroy(NULL, m, NULL); +- } +- +- return TRUE; +-} +- +-static void +-alarm_msg_received(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); +- if (m->receive_msg) { +- m->receive_msg (e, m, data); +- } +-} +- + /** + * alarm_notify_new: + * +@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg + AlarmNotify * + alarm_notify_new (void) + { +- AlarmNotify *an; +- +- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); +- +- /* Create a thread for alarm queue operation*/ +- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); +- +- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); +- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, NULL); +- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, NULL); +- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); +- +- an = g_object_new (TYPE_ALARM_NOTIFY, +- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), +- NULL); +- +- return an; ++ return g_object_new (TYPE_ALARM_NOTIFY, ++ "poa", bonobo_poa_get_threaded ( ++ ORBIT_THREAD_HINT_PER_REQUEST, NULL), ++ NULL); + } + + static void +diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c +--- evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 ++++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c 2007-10-29 14:47:20.000000000 -0400 +@@ -98,9 +98,6 @@ static int tray_blink_id = -1; + static int tray_blink_state = FALSE; + static AlarmNotify *an; + +-/* Main Tasks thread for dealing with the global structures */ +-extern EThread *alarm_operation_thread; +- + /* Structure that stores a client we are monitoring */ + typedef struct { + /* Monitored client */ +@@ -182,6 +179,40 @@ static void on_dialog_objs_removed_cb (E + static void load_alarms_for_today (ClientAlarms *ca); + static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); + ++/* Simple asynchronous message dispatcher */ ++ ++typedef struct _Message Message; ++typedef void (*MessageFunc) (Message *msg); ++ ++struct _Message { ++ MessageFunc func; ++}; ++ ++static void ++message_proxy (Message *msg) ++{ ++ g_return_if_fail (msg->func != NULL); ++ ++ msg->func (msg); ++} ++ ++static gpointer ++create_thread_pool (void) ++{ ++ /* once created, run forever */ ++ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); ++} ++ ++static void ++message_push (Message *msg) ++{ ++ static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, NULL); ++ ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} ++ + /* Queues an alarm trigger for midnight so that we can load the next day's worth + * of alarms. + */ +@@ -220,47 +251,41 @@ add_client_alarms_cb (gpointer key, gpoi + } + + struct _midnight_refresh_msg { ++ Message header; + gboolean remove; + }; + + /* Loads the alarms for the new day every midnight */ + static void +-midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) ++midnight_refresh_async (struct _midnight_refresh_msg *msg) + { +- struct _midnight_refresh_msg *list = msg->data; +- + d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); + + /* Re-load the alarms for all clients */ + g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); + + /* Re-schedule the midnight update */ +- if (list->remove && midnight_refresh_id != NULL) { ++ if (msg->remove && midnight_refresh_id != NULL) { + d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); + alarm_remove (midnight_refresh_id); + midnight_refresh_id = NULL; + } + + queue_midnight_refresh (); ++ ++ g_slice_free (struct _midnight_refresh_msg, msg); + } + + static void + midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) + { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = TRUE; +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = TRUE; + +- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Looks up a client in the client alarms hash table */ +@@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo + * alarms. + */ + struct _query_msg { ++ Message header; + ECal *client; + GList *objects; + gpointer data; +@@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) + } + + static void +-query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_changed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + time_t from, day_end; +@@ -700,13 +726,12 @@ query_objects_changed_async (EThread *e, + icaltimezone *zone; + CompQueuedAlarms *cqa; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + from = config_data_get_last_notification_time (); + if (from == -1) +@@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, + comp = NULL; + } + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_changed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_changed_async; +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ical (objects); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_changed_async; ++ msg->client = client; ++ msg->objects = duplicate_ical (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + /* Called when a calendar component is removed; we must delete its corresponding + * alarms. + */ + static void +-query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_removed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); + +@@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, + } + + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ecal (objects); +- list->data = data; +- msg->data = list; ++ struct _query_msg *msg; + +- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_removed_async; ++ msg->client = client; ++ msg->objects = duplicate_ecal (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + +@@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ + } + + static void +-on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) ++on_dialog_objs_removed_async (struct _query_msg *msg) + { + const char *our_uid; + GList *l; + TrayIconData *tray_data; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + + d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); + +- client = list->client; +- tray_data = list->data; +- objects = list->objects; ++ client = msg->client; ++ tray_data = msg->data; ++ objects = msg->objects; + + e_cal_component_get_uid (tray_data->comp, &our_uid); + g_return_if_fail (our_uid && *our_uid); +@@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e + tray_data = NULL; + } + } ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = on_dialog_objs_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = objects; +- list->data = data; +- msg->data = list; ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; ++ msg->client = client; ++ msg->objects = objects; ++ msg->data = data; + +- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + struct _tray_cqa_msg { ++ Message header; + CompQueuedAlarms *cqa; + }; + + static void +-tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) + { +- struct _tray_cqa_msg *tmsg = msg->data; +- CompQueuedAlarms *cqa = tmsg->cqa; ++ CompQueuedAlarms *cqa = msg->cqa; + GList *list = tray_icons_list; + + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); +@@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A + gtk_tree_selection_select_iter (sel, &iter); + } + } ++ ++ g_slice_free (struct _tray_cqa_msg, msg); + } + + static void + tray_list_remove_cqa (CompQueuedAlarms *cqa) + { +- AlarmMsg *msg; +- struct _tray_cqa_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_cqa_async; +- +- list = malloc (sizeof (struct _tray_cqa_msg)); +- list->cqa = cqa; +- msg->data = list; ++ struct _tray_cqa_msg *msg; ++ ++ msg = g_slice_new (struct _tray_cqa_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; ++ msg->cqa = cqa; + +- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Callback used from the alarm notify dialog */ + static void +-tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_async (Message *msg) + { + GList *list = tray_icons_list; + +@@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm + } else + list = list->next; + } ++ ++ g_slice_free (Message, msg); + } + + static void + tray_list_remove_icons (void) + { +- AlarmMsg *msg; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_async; ++ Message *msg; + +- msg->data = NULL; ++ msg = g_slice_new (Message); ++ msg->func = tray_list_remove_async; + +- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push (msg); + } + + struct _tray_msg { ++ Message header; + TrayIconData *data; + }; + + static void +-tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_data_async (struct _tray_msg *msg) + { +- struct _tray_msg *tmsg = msg->data; +- TrayIconData *tray_data = tmsg->data; ++ TrayIconData *tray_data = msg->data; + + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); + + tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); + free_tray_icon_data (tray_data); + tray_data = NULL; ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_remove_data (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_data_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; ++ struct _tray_msg *msg; ++ ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_data_async; ++ msg->data = data; + +- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + static void +@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) + /* Add a new data to tray list */ + + static void +-tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) ++tray_list_add_async (struct _tray_msg *msg) + { +- struct _tray_msg *list = msg->data; +- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); +- tray_icons_list = g_list_prepend (tray_icons_list, list->data); ++ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); ++ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_add_new (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; ++ struct _tray_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_add_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_add_async; ++ msg->data = data; ++ ++ message_push ((Message *) msg); + } + + /* Performs notification of a display alarm */ +@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da + new_midnight = time_day_end_with_zone (time (NULL), zone); + + if (new_midnight > midnight) { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = FALSE; +- /* We dont need it. So set it to NULL */ +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = FALSE; + +- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + return TRUE; +@@ -1981,14 +1970,15 @@ hash_ids (gpointer a) + } + + struct _alarm_client_msg { ++ Message header; + ECal *client; + }; + +-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) ++static void ++alarm_queue_add_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre + G_CALLBACK (cal_opened_cb), + ca); + } ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + /** +@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre + void + alarm_queue_add_client (ECal *client) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_add_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- g_object_ref (client); +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_add_async; ++ msg->client = g_object_ref (client); + +- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Removes a component an its alarms */ +@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) + * Removes a calendar client from the alarm queueing system. + **/ + static void +-alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) ++alarm_queue_remove_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al + g_free (ca); + + g_hash_table_remove (client_alarms_hash, client); ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + /** alarm_queue_remove_client +@@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al + void + alarm_queue_remove_client (ECal *client, gboolean immediately) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_remove_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; + +- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); + if (immediately) { +- alarm_queue_remove_async (NULL, msg, NULL); +- g_free (list); +- g_free (msg); ++ alarm_queue_remove_async (msg); + } else +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 04f5d2a..700d85e 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -1,6 +1,7 @@ ---- evolution-2.9.1/mail/message-list.c.ememory 2006-10-25 11:11:34.000000000 -0400 -+++ evolution-2.9.1/mail/message-list.c 2006-10-25 11:15:12.000000000 -0400 -@@ -412,70 +412,28 @@ +diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail/message-list.c +--- evolution-2.21.1/mail/message-list.c.kill-ememory 2007-10-29 10:44:57.000000000 -0400 ++++ evolution-2.21.1/mail/message-list.c 2007-10-29 10:48:44.000000000 -0400 +@@ -416,70 +416,28 @@ get_message_info (MessageList *message_l return info; } @@ -91,7 +92,7 @@ } static void -@@ -1283,12 +1241,23 @@ +@@ -1287,12 +1245,23 @@ ml_tree_value_at (ETreeModel *etm, ETree str = camel_message_info_from (msg_info); return (void *)(str ? str : ""); case COL_FROM_NORM: @@ -117,7 +118,7 @@ case COL_SENT: { ETreePath child; -@@ -1312,7 +1281,8 @@ +@@ -1316,7 +1285,8 @@ ml_tree_value_at (ETreeModel *etm, ETree str = camel_message_info_to (msg_info); return (void *)(str ? str : ""); case COL_TO_NORM: @@ -127,10 +128,11 @@ case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); case COL_DELETED: -@@ -2023,9 +1993,10 @@ - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - - message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); +@@ -2070,9 +2040,11 @@ message_list_init (MessageList *message_ + g_str_hash, g_str_equal, + (GDestroyNotify) NULL, + (GDestroyNotify) e_poolv_destroy); ++ + message_list->string_chunk = g_string_chunk_new (1024); message_list->hidden = NULL; @@ -139,26 +141,9 @@ message_list->hide_before = ML_HIDE_NONE_START; message_list->hide_after = ML_HIDE_NONE_END; -@@ -2054,14 +2025,6 @@ - g_signal_connect (((GtkScrolledWindow *) message_list)->vscrollbar, "value-changed", G_CALLBACK (ml_scrolled), message_list); - } - --static gboolean --normalised_free (gpointer key, gpointer value, gpointer user_data) --{ -- e_poolv_destroy (value); -- -- return TRUE; --} -- - static void - message_list_destroy(GtkObject *object) - { -@@ -2127,17 +2090,17 @@ - MessageList *message_list = MESSAGE_LIST (object); +@@ -2166,15 +2138,16 @@ message_list_finalise (GObject *object) struct _MessageListPrivate *p = message_list->priv; -- g_hash_table_foreach (message_list->normalised_hash, (GHFunc) normalised_free, NULL); g_hash_table_destroy (message_list->normalised_hash); + g_string_chunk_free (message_list->string_chunk); @@ -175,38 +160,17 @@ } g_free(message_list->search); -@@ -2940,17 +2903,6 @@ - d(printf("changed = %d added = %d removed = %d\n", - changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len)); - -- for (i = 0; i < changes->uid_removed->len; i++) { -- /* uncache the normalised strings for these uids */ -- EPoolv *poolv; -- -- poolv = g_hash_table_lookup (ml->normalised_hash, changes->uid_removed->pdata[i]); -- if (poolv != NULL) { -- g_hash_table_remove (ml->normalised_hash, changes->uid_removed->pdata[i]); -- e_poolv_destroy (poolv); -- } -- } -- - /* check if the hidden state has changed, if so modify accordingly, then regenerate */ - if (ml->hidejunk || ml->hidedeleted) - mail_folder_hide_by_flag (folder, ml, &changes, (ml->hidejunk ? CAMEL_MESSAGE_JUNK : 0) | (ml->hidedeleted ? CAMEL_MESSAGE_DELETED : 0)); -@@ -3028,7 +2980,11 @@ - } +@@ -3124,6 +3097,9 @@ message_list_set_folder (MessageList *me /* reset the normalised sort performance hack */ -- g_hash_table_foreach_remove (message_list->normalised_hash, normalised_free, NULL); -+ /* XXX GLib 2.12 added g_hash_table_remove_all() */ -+ g_hash_table_destroy (message_list->normalised_hash); -+ message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_remove_all (message_list->normalised_hash); ++ + g_string_chunk_free (message_list->string_chunk); + message_list->string_chunk = g_string_chunk_new (1024); mail_regen_cancel(message_list); -@@ -3479,14 +3435,14 @@ +@@ -3574,14 +3550,14 @@ message_list_hide_uids (MessageList *ml, MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden == NULL) { ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -224,7 +188,7 @@ g_hash_table_insert (ml->hidden, uid, uid); } } -@@ -3507,9 +3463,9 @@ +@@ -3602,9 +3578,9 @@ message_list_hide_clear (MessageList *ml MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -236,7 +200,7 @@ } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3545,9 +3501,9 @@ +@@ -3640,9 +3616,9 @@ load_hide_state (MessageList *ml) MESSAGE_LIST_LOCK(ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -248,7 +212,7 @@ } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3558,7 +3514,7 @@ +@@ -3653,7 +3629,7 @@ load_hide_state (MessageList *ml) camel_file_util_decode_fixed_int32 (in, &version); if (version == HIDE_STATE_VERSION) { ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); @@ -257,7 +221,7 @@ camel_file_util_decode_fixed_int32 (in, &lower); ml->hide_before = lower; camel_file_util_decode_fixed_int32 (in, &upper); -@@ -3567,7 +3523,7 @@ +@@ -3662,7 +3638,7 @@ load_hide_state (MessageList *ml) char *olduid, *uid; if (camel_file_util_decode_string (in, &olduid) != -1) { @@ -266,7 +230,7 @@ g_free (olduid); g_hash_table_insert(ml->hidden, uid, uid); } -@@ -3717,12 +3673,12 @@ +@@ -3811,12 +3787,12 @@ regen_list_exec (struct _regen_list_msg if (m->ml->hidden == NULL) { m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -281,9 +245,10 @@ g_hash_table_insert (m->ml->hidden, uid, uid); } } ---- evolution-2.9.1/mail/message-list.h.ememory 2006-09-28 04:56:51.000000000 -0400 -+++ evolution-2.9.1/mail/message-list.h 2006-10-25 11:15:12.000000000 -0400 -@@ -102,11 +102,12 @@ +diff -up evolution-2.21.1/mail/message-list.h.kill-ememory evolution-2.21.1/mail/message-list.h +--- evolution-2.21.1/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.1/mail/message-list.h 2007-10-29 10:44:57.000000000 -0400 +@@ -102,11 +102,12 @@ struct _MessageList { GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ GHashTable *normalised_hash; diff --git a/evolution.spec b/evolution.spec index f013be5..04260c8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,23 +1,22 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 1.11.0 +%define eds_version 2.21.1 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gnomevfs2_version 2.4 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.16.0 +%define gtkhtml_version 3.17.1 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.16.0 %define libbonoboui_version 2.4.2 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 -%define redhat_menus_version 5.0.4 %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.12 +%define evo_major 2.22 %define exchange_support 1 %define inline_audio_support 1 @@ -45,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.12.1 -Release: 2%{?dist} +Version: 2.21.1 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -71,7 +70,8 @@ Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch Patch12: evolution-2.0.2-fix-145552.patch # Part of RH bug 170799: -Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch +# XXX Revert this for Fedora 9 +#Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff @@ -114,16 +114,8 @@ Patch30: evolution-2.9.3-source-path-entry.patch Patch31: evolution-2.9.3-meeting-list-view.patch # GNOME bug #376991 -Patch33: evolution-2.10.0-e-passwords.patch - -# GNOME bug #417999 -Patch34: evolution-2.10.0-e-source-combo-box.patch - -# GNOME bug #476040 -Patch35: evolution-2.11.92-mail-attachment.patch - -# GNOME bug #477045 -Patch36: evolution-2.11.92-icon-names.patch +# XXX Disabled due to outstanding issues. +#Patch33: evolution-2.10.0-e-passwords.patch ## Dependencies ### @@ -131,23 +123,9 @@ Requires(post): GConf2 Requires(post): scrollkeeper >= %{scrollkeeper_version} Requires(postun): scrollkeeper >= %{scrollkeeper_version} -Requires: ORBit2 >= %{orbit2_version} -Requires: dbus >= %{dbus_version} -Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-spell >= 1.0.2 Requires: gnome-themes -Requires: gnome-vfs2 >= %{gnomevfs2_version} -Requires: gnutls -Requires: gtk2 >= %{gtk2_version} -Requires: libbonobo >= %{libbonobo_version} -Requires: libbonoboui >= %{libbonoboui_version} -Requires: libsoup >= %{soup_version} -Requires: redhat-menus >= %{redhat_menus_version} - -%if %{libnotify_support} -Requires: libnotify >= 0.4 -%endif ### Build Dependencies ### @@ -251,7 +229,7 @@ This package contains the help for Evolution. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar %patch12 -p1 -b .fix-164957 -%patch13 -p1 -b .hide-switcher-buttons-by-default +#patch13 -p1 -b .hide-switcher-buttons-by-default #patch14 -p1 -b .fix-conduits # leave commented %patch15 -p1 -b .fix-conduit-dir %patch16 -p1 -b .no-gnome-common @@ -264,10 +242,7 @@ This package contains the help for Evolution. #%patch29 -p1 -b .view-attachment-uri %patch30 -p1 -b .source-path-entry %patch31 -p1 -b .meeting-list-view -%patch33 -p1 -b .e-passwords -%patch34 -p1 -b .e-source-combo-box -%patch35 -p1 -b .mail-attachment -%patch36 -p1 -b .icon-names +#%patch33 -p1 -b .e-passwords mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -394,19 +369,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la # scrollkeeper gets handled in %post rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop - -# remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop - rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime @@ -460,22 +422,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/evolution # Desktop files: -%{_datadir}/applications/redhat-evolution-mail.desktop -%{_datadir}/applications/redhat-evolution-calendar.desktop -%{_datadir}/applications/redhat-evolution-contacts.desktop -%{_datadir}/applications/redhat-evolution-tasks.desktop +%{_datadir}/applications/evolution.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/evolution.png %{_datadir}/icons/hicolor/22x22/apps/evolution.png %{_datadir}/icons/hicolor/24x24/apps/evolution.png %{_datadir}/icons/hicolor/32x32/apps/evolution.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-autocompletion.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-certificates.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-composer.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-mail-accounts.png -%{_datadir}/icons/hicolor/48x48/apps/preferences-mail.png +%{_datadir}/icons/hicolor/48x48/apps/evolution.png %{_datadir}/icons/hicolor/scalable/apps/evolution.svg # IDL files (should this be in devel subpackage?) @@ -530,7 +484,6 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify -%{_libexecdir}/evolution/%{evo_major}/evolution-backup %{_libexecdir}/evolution/%{evo_major}/killev # Various conduits for gnome-pilot: @@ -598,6 +551,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so +%{evo_plugin_dir}/org-gnome-evolution-google.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-google.so + %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so @@ -682,10 +638,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug %{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so -%{evo_plugin_dir}/liborg-gnome-backup-restore.so -%{evo_plugin_dir}/org-gnome-backup-restore.eplug -%{evo_plugin_dir}/org-gnome-backup-restore.xml - %files devel %defattr(-, root, root) %{_includedir}/evolution-%{evo_major} @@ -718,6 +670,21 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/omf/evolution %changelog +* Mon Oct 29 2007 Matthew Barnes - 2.12.1-2.fc9 +- Update to 2.21.1 +- Remove redundant requirements. +- Bump EDS requirement to 2.21.1. +- Bump gtkhtml requirement to 3.17.1. +- Backup/restore plugin got moved from standard to experimental. +- Revert the per-component menu items (RH bug #222105, #241462, #293771). +- Show the switcher buttons by default (RH bug #186403). +- Alter the desktop file Name and Comment. +- Disable patch for GNOME bug #376991 for now. It may be contributing + to password prompting problems as described in RH bug #296671. +- Remove patch for GNOME bug #417999 (fixed upstream). +- Remove patch for GNOME bug #476040 (fixed upstream). +- Remove patch for GNOME bug #477045 (fixed upstream). + * Mon Oct 15 2007 Matthew Barnes - 2.12.1-2.fc8 - Fix a broken zoom icon. diff --git a/sources b/sources index c60686b..fb67034 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -392623efa9b79ede17ce90512f2c3c0a evolution-2.12.1.tar.bz2 +53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2