1 files changed, 19 insertions, 75 deletions

diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index bd0c4bbb2f..455542808f 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -58,18 +58,6 @@
 
 #define d(x)
 
-
-typedef struct _FolderBrowserPrivate {
-	GMutex *lock;
-
-	/* If we have outstanding tasks running */
-	GSList	    *tasks;
-	GSList	    *tasks_done;
-} FolderBrowserPrivate;
-
-#define FOLDER_BROWSER_LOCK(fb) g_mutex_lock(((FolderBrowser *)(fb))->priv->lock);
-#define FOLDER_BROWSER_UNLOCK(fb) g_mutex_unlock(((FolderBrowser *)(fb))->priv->lock);
-
 #define PARENT_TYPE (gtk_table_get_type ())
 
 static void folder_changed(CamelObject *o, void *event_data, void *data);
@@ -124,28 +112,8 @@ folder_browser_finalise (GtkObject *object)
 {
 	FolderBrowser *folder_browser;
 	CORBA_Environment ev;
-	FolderBrowserPrivate *p;
 
 	folder_browser = FOLDER_BROWSER(object);
-	p = folder_browser->priv;
-
-	/* This @#$#@ is to make sure we dont have any outstanding implicit
-	   refs on us from outstanding async tasks */
-	FOLDER_BROWSER_LOCK(folder_browser);
-	while (p->tasks) {
-		int id;
-
-		id = (int)p->tasks->data;
-		FOLDER_BROWSER_UNLOCK(folder_browser);
-		mail_msg_wait(id);
-		FOLDER_BROWSER_LOCK(folder_browser);
-	}
-	/* the tasks_done list is just to avoid races, we can simply free it now */
-	g_slist_free(p->tasks_done);
-	p->tasks_done = NULL;
-	FOLDER_BROWSER_UNLOCK(folder_browser);
-
-	CORBA_exception_init (&ev);
 
 	if (folder_browser->seen_id != 0) {
 		gtk_timeout_remove (folder_browser->seen_id);
@@ -156,7 +124,22 @@ folder_browser_finalise (GtkObject *object)
 		gtk_timeout_remove(folder_browser->loading_id);
 		folder_browser->loading_id = 0;
 	}
-	
+
+	/* wait for all outstanding async events against us */
+	mail_async_event_destroy(folder_browser->async_event);
+
+	if (folder_browser->folder) {
+		camel_object_unhook_event(CAMEL_OBJECT(folder_browser->folder), "folder_changed",
+					  folder_changed, folder_browser);
+		camel_object_unhook_event(CAMEL_OBJECT(folder_browser->folder), "message_changed",
+					  folder_changed, folder_browser);
+		mail_sync_folder (folder_browser->folder, NULL, NULL);
+		camel_object_unref (CAMEL_OBJECT (folder_browser->folder));
+		folder_browser->folder = NULL;
+	}
+
+	CORBA_exception_init (&ev);
+
 	if (folder_browser->search_full)
 		gtk_object_unref (GTK_OBJECT (folder_browser->search_full));
 	
@@ -179,15 +162,6 @@ folder_browser_finalise (GtkObject *object)
 	g_free (folder_browser->uri);
 	folder_browser->uri = NULL;
 	
-	if (folder_browser->folder) {
-		camel_object_unhook_event(CAMEL_OBJECT(folder_browser->folder), "folder_changed",
-					  folder_changed, folder_browser);
-		camel_object_unhook_event(CAMEL_OBJECT(folder_browser->folder), "message_changed",
-					  folder_changed, folder_browser);
-		mail_sync_folder (folder_browser->folder, NULL, NULL);
-		camel_object_unref (CAMEL_OBJECT (folder_browser->folder));
-		folder_browser->folder = NULL;
-	}
 	
 	CORBA_exception_free (&ev);
 	
@@ -207,9 +181,6 @@ folder_browser_finalise (GtkObject *object)
 	if (folder_browser->clipboard_selection)
 		g_byte_array_free (folder_browser->clipboard_selection, TRUE);
 
-	g_mutex_free(p->lock);
-	g_free(p);
-
 	folder_browser_parent_class->finalize(object);
 }
 
@@ -821,43 +792,18 @@ update_status_bar(FolderBrowser *fb)
 static void main_folder_changed(CamelObject *o, void *event_data, void *data)
 {
 	FolderBrowser *fb = data;
-	FolderBrowserPrivate *p = fb->priv;
-	int id;
 
 	/* so some corba unref doesnt blow us away while we're busy */
 	gtk_object_ref((GtkObject *)fb);
 	update_status_bar(fb);
-
-	id = mail_proxy_event_id();
-	if (id != -1) {
-		FOLDER_BROWSER_LOCK(fb);
-		if (g_slist_find(p->tasks, (void *)id))
-			p->tasks = g_slist_remove(p->tasks, (void *)id);
-		else
-			p->tasks_done = g_slist_prepend(p->tasks_done, (void *)id);
-		FOLDER_BROWSER_UNLOCK(fb);
-	}
 	gtk_object_unref((GtkObject *)fb);
 }
 
 static void folder_changed(CamelObject *o, void *event_data, void *data)
 {
-	int id;
 	FolderBrowser *fb = data;
-	FolderBrowserPrivate *p = fb->priv;
-
-	/* this snot is so we can implicitly and asynchronosly ref
-	   the folder browser, since we can't actually ref it because
-	   gtk_object_ref isn't threadsafe ... #@$@ */
-	id = mail_proxy_event(main_folder_changed, o, event_data, data);
-	if (id != -1) {
-		FOLDER_BROWSER_LOCK(fb);
-		if (g_slist_find(p->tasks_done, (void *)id))
-			p->tasks_done = g_slist_remove(p->tasks_done, (void *)id);
-		else
-			p->tasks = g_slist_prepend(p->tasks, (void *)id);
-		FOLDER_BROWSER_UNLOCK(fb);
-	}
+
+	mail_async_event_emit(fb->async_event, main_folder_changed, o, NULL, data);
 }
 
 static void
@@ -1966,10 +1912,8 @@ static void
 folder_browser_init (GtkObject *object)
 {
 	FolderBrowser *fb = (FolderBrowser *)object;
-	FolderBrowserPrivate *p;
 
-	p = fb->priv = g_malloc0(sizeof(*fb->priv));
-	p->lock = g_mutex_new();
+	fb->async_event = mail_async_event_new();
 }
 
 static void