Remove MailAsyncEvent.

As of commit 7fa0dd78305677d14839a480fc379ebba3a6d55c, all CamelFolder
and CamelStore signals are emitted from idle callbacks.  That means we
don't have to propagate events to the main loop thread anymore, which
eliminates all remaining uses of MailAsyncEvent.

1 files changed, 4 insertions, 34 deletions

diff --git a/mail/message-list.c b/mail/message-list.c
index 3bd2413d32..eef110e3f0 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2399,7 +2399,6 @@ message_list_init (MessageList *message_list)
 	message_list->ensure_uid = NULL;
 
 	message_list->uid_nodemap = g_hash_table_new (g_str_hash, g_str_equal);
-	message_list->async_event = mail_async_event_new ();
 
 	message_list->cursor_uid = NULL;
 	message_list->last_sel_single = FALSE;
@@ -2438,11 +2437,6 @@ message_list_destroy (GtkObject *object)
 
 	p->destroyed = TRUE;
 
-	if (message_list->async_event) {
-		mail_async_event_destroy (message_list->async_event);
-		message_list->async_event = NULL;
-	}
-
 	if (message_list->folder) {
 		mail_regen_cancel (message_list);
 
@@ -3629,15 +3623,13 @@ mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChang
 }
 
 static void
-main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
+folder_changed (CamelFolder *folder,
+                CamelFolderChangeInfo *changes,
+                MessageList *ml)
 {
-	MessageList *ml = MESSAGE_LIST (user_data);
-	CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data;
-	CamelFolder *folder = (CamelFolder *)o;
 	gint i;
 
-	/* may be NULL if we're in the process of being destroyed */
-	if (ml->async_event == NULL)
+	if (ml->priv->destroyed)
 		return;
 
 	d(printf("folder changed event, changes = %p\n", changes));
@@ -3675,28 +3667,6 @@ main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
 	mail_regen_list (ml, ml->search, NULL, changes);
 }
 
-static void
-folder_changed (CamelFolder *folder,
-                CamelFolderChangeInfo *info,
-                MessageList *ml)
-{
-	CamelFolderChangeInfo *changes;
-
-	if (ml->priv->destroyed)
-		return;
-
-	if (info != NULL) {
-		changes = camel_folder_change_info_new ();
-		camel_folder_change_info_cat (changes, info);
-	} else {
-		changes = NULL;
-	}
-
-	mail_async_event_emit (
-		ml->async_event, (MailAsyncFunc)
-		main_folder_changed, folder, changes, ml);
-}
-
 /**
  * message_list_set_folder:
  * @message_list: Message List widget