Removed old implementation.

2001-01-04  Not Zed  <NotZed@HelixCode.com>

	* mail-ops.c (mail_do_send_mail): Removed old implementation.

	* folder-browser.c (do_message_selected): If we haven't got a real
	uid, then clear the display instead.

	* message-list.c (message_list_drag_data_get): Use new save
	message function, and also wait for it to finish before
	continuing.
	(folder_changed):
	(message_changed): Use mail_proxy_event instead of
	mail_do_forward.
	(mail_regen_list): New iplementation to replace the old.
	: remove <gnome.h> from headers.  Dont define timeit by default.
	(main_folder_changed):
	(message_list_set_folder):
	(message_list_set_threaded):
	(message_list_set_search):
	(message_list_hide_add):
	(message_list_hide_uids):
	(message_list_hide_clear): Use mail_regen_list instead of
	mail_do_regenerate_messagelist.
	(mail_do_regenerate_messagelist): Removed the old stuff.  No
	functionality changed yet, just using different thread stuff.

	* mail-callbacks.c (save_msg_ok): Use new save message function.

	* component-factory.c (create_view):
	(add_storage): Use mail_scan_subfolders to build the folder info.
	(create_folder): Use new implementation with our own callback.
	(owner_set_cb): Changed b ack to use mail_get_folder, but now wait
	for it to finish.  This will let any gui still run, but also gives
	us the required synchronous operation.
	(got_folder): Callback for when the folder has been opened.

	* mail-ops.c (mail_get_folderinfo): New function to just get the
	folder info in another thread.
	(mail_scan_subfolders): New scan subfolder implementation that
	uses mail_get_folderinfo.
	(mail_do_scan_subfolders): Removed old implementation.
	(mail_create_folder): Nerw implementation to create a folder, only.
	(mail_do_create_folder): Removed old implementation.
	(mail_save_messages): New implementation, fixes a couple of minor
	problems, and now provides a return so it can be waited on.  Also
	check that the writes worked, etc.
	(mail_do_save_messages): Remove previous implementation.
	(mail_do_flag_messages): Removed, nothing uses it.
	(mail_do_flag_messages): Removed, nothing uses it anymore.
	(mail_get_folder): REturn the operation id, so callers can wait
	for it.
	(sync_folder_desc):
	(expunge_folder_desc): Add describe functions so we know what its
	doing.
	(mail_send_mail): More generic implementation of sending mail.

	* mail-mt.c (mail_msg_new): Lock around seq increment.  And insert
	each new message into a hash table of active messages.
	(mail_msg_init): Init the active message table.
	(mail_msg_free): Remove the message from the active message table.
	(mail_msg_wait): New function, waits for a message to be
	processed, by id.
	(mail_msg_check_error): Dont display the error if it is a
	user-cancelled operation.
	(mail_proxy_event): new implementation of mail_op_forward_event.
	Only real difference is it uses the new	thread stuff, and you can
	wait for it to finish if you want.
	(mail_proxy_event): If we're already in the main thread, just call
	the function.

svn path=/trunk/; revision=7246

1 files changed, 42 insertions, 4 deletions

diff --git a/mail/component-factory.c b/mail/component-factory.c
index 7e951261a2..f89a9dbc80 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -94,7 +94,7 @@ create_view (EvolutionShellComponent *shell_component,
 		}
 
 		if (!gtk_object_get_data (GTK_OBJECT (storage), "connected"))
-			mail_do_scan_subfolders (CAMEL_STORE(store), storage);
+			mail_scan_subfolders (CAMEL_STORE(store), storage);
 		camel_object_unref (CAMEL_OBJECT (store));
 
 		control = folder_browser_factory_new_control ("", corba_shell);
@@ -109,13 +109,41 @@ create_view (EvolutionShellComponent *shell_component,
 }
 
 static void
+do_create_folder(char *uri, CamelFolder *folder, void *data)
+{
+	GNOME_Evolution_ShellComponentListener listener = data;
+	CORBA_Environment ev;
+	GNOME_Evolution_ShellComponentListener_Result result;
+
+	if (folder)
+		result = GNOME_Evolution_ShellComponentListener_OK;
+	else
+		result = GNOME_Evolution_ShellComponentListener_INVALID_URI;
+
+	CORBA_exception_init(&ev);
+	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &ev);
+	CORBA_Object_release(listener, &ev);
+	CORBA_exception_free(&ev);
+}
+
+static void
 create_folder (EvolutionShellComponent *shell_component,
 	       const char *physical_uri,
 	       const char *type,
 	       const GNOME_Evolution_ShellComponentListener listener,
 	       void *closure)
 {
-	mail_do_create_folder (listener, physical_uri, type);
+	char *uri;
+	CORBA_Environment ev;
+
+	CORBA_exception_init(&ev);
+	if (!strcmp(type, "mail")) {
+		uri = g_strdup_printf ("mbox://%s", physical_uri);
+		mail_create_folder(uri, do_create_folder, CORBA_Object_duplicate(listener, &ev));
+	} else {
+		GNOME_Evolution_ShellComponentListener_notifyResult(listener, GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE, &ev);
+	}
+	CORBA_exception_free(&ev);
 }
 
 static struct {
@@ -127,6 +155,16 @@ static struct {
 	{ "Sent", &sent_folder },
 };
 
+static void got_folder(char *uri, CamelFolder *folder, void *data)
+{
+	CamelFolder **fp = data;
+
+	if (folder) {
+		*fp = folder;
+		camel_object_ref((CamelObject *)folder);
+	}
+}
+
 static void
 owner_set_cb (EvolutionShellComponent *shell_component,
 	      EvolutionShellClient *shell_client,
@@ -158,7 +196,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 
 	for (i=0;i<sizeof(standard_folders)/sizeof(standard_folders[0]);i++) {
 		char *uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name);
-		*standard_folders[i].folder = mail_tool_uri_to_folder_noex(uri);
+		mail_msg_wait(mail_get_folder(uri, got_folder, standard_folders[i].folder));
 		g_free(uri);
 	}
 
@@ -268,7 +306,7 @@ add_storage (const char *uri, CamelService *store,
 	case EVOLUTION_STORAGE_OK:
 		g_hash_table_insert (storages_hash, store, storage);
 		camel_object_ref (CAMEL_OBJECT (store));
-		mail_do_scan_subfolders (CAMEL_STORE (store), storage);
+		mail_scan_subfolders (CAMEL_STORE (store), storage);
 		/* falllll */
 	case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED:
 	case EVOLUTION_STORAGE_ERROR_EXISTS: