Pass an empty flags argument to mail_tool_uri_to_folder.

2001-10-02  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-vfolder.c (vfolder_setup_do): Pass an empty flags argument
	to mail_tool_uri_to_folder.
	(vfolder_adduri_do): Same.

	* mail-session.c (get_folder): Pass an empty flags argument to
	mail_tool_uri_to_folder.

	* mail-send-recv.c (receive_get_folder): Pass an empty flags
	argument to mail_tool_uri_to_folder.

	* mail-ops.c (get_folder_get): Pass the flags to
	mail_tool_uri_to_folder.
	(mail_get_folder): Now takes a flags argument.
	(remove_folder_get): Pass an empty flags argument to
	mail_tool_uri_to_folder.
	(mail_send_message): Pass an empty argument flag to
	mail_tool_uri_to_folder.
	(transfer_messages_transfer): Same. Destination folder should
	already be created by this time.

	* folder-info.c (do_get_info): Pass an empty flags argument to
	mail_tool_uri_to_folder.

	* importers/evolution-mbox-importer.c (folder_created_cb): Pass
	the CREATE flag here too.
	(load_file_fn): And here.
	(load_file_fn): And here too.

	* importers/evolution-outlook-importer.c (load_file_fn): Pass the
	CREATE flag to mail_tool_uri_to_folder.

	* folder-browser.c (folder_browser_new): Pass an empty flags
	argument.
	(x_evolution_message_parse): Pass an empty flags argument to
	mail_tool_uri_to_folder.

	* component-factory.c (create_folder): Pass a CREATE flag to
	mail_get_folder here too.
	(owner_set_cb): And here.
	(xfer_folder): Shouldn't need the CREATE flag here, so not passing
	any flags.
	(destination_folder_handle_drop): Same.

	* mail-local.c (mail_local_store_add_folder): Pass a CREATE flag
	to mail_get_folder.
	(reconfigure_folder_reconfigure): Pass an empty flags argument to
	mail_tool_uri_to_folder.

	* mail-tools.c (mail_tool_uri_to_folder): Take a flags argument.
	(mail_tool_get_local_inbox): Pass an empty flags argument to
	mail_tool_uri_to_folder.

svn path=/trunk/; revision=13353

1 files changed, 9 insertions, 5 deletions

diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8867ecb140..9f55bd2f0f 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -488,7 +488,7 @@ mail_send_message(CamelMimeMessage *message, const char *destination, CamelFilte
 	}
 	
 	if (sent_folder_uri) {
-		folder = mail_tool_uri_to_folder (sent_folder_uri, NULL);
+		folder = mail_tool_uri_to_folder (sent_folder_uri, 0, NULL);
 		g_free (sent_folder_uri);
 		if (!folder) {
 			/* FIXME */
@@ -881,7 +881,7 @@ transfer_messages_transfer (struct _mail_msg *mm)
 		desc = _("Copying");
 	}
 	
-	dest = mail_tool_uri_to_folder (m->dest_uri, &mm->ex);
+	dest = mail_tool_uri_to_folder (m->dest_uri, 0, &mm->ex);
 	if (camel_exception_is_set (&mm->ex))
 		return;
 	
@@ -1202,6 +1202,7 @@ struct _get_folder_msg {
 	struct _mail_msg msg;
 
 	char *uri;
+	guint32 flags;
 	CamelFolder *folder;
 	void (*done) (char *uri, CamelFolder *folder, void *data);
 	void *data;
@@ -1220,7 +1221,7 @@ get_folder_get (struct _mail_msg *mm)
 {
 	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
 	
-	m->folder = mail_tool_uri_to_folder (m->uri, &mm->ex);
+	m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex);
 }
 
 static void
@@ -1250,13 +1251,16 @@ static struct _mail_msg_op get_folder_op = {
 };
 
 int
-mail_get_folder (const char *uri, void (*done)(char *uri, CamelFolder *folder, void *data), void *data, EThread *thread)
+mail_get_folder (const char *uri, guint32 flags,
+		 void (*done)(char *uri, CamelFolder *folder, void *data),
+		 void *data, EThread *thread)
 {
 	struct _get_folder_msg *m;
 	int id;
 	
 	m = mail_msg_new(&get_folder_op, NULL, sizeof(*m));
 	m->uri = g_strdup (uri);
+	m->flags = flags;
 	m->data = data;
 	m->done = done;
 	
@@ -1364,7 +1368,7 @@ remove_folder_get (struct _mail_msg *mm)
 	
 	m->removed = FALSE;
 	
-	folder = mail_tool_uri_to_folder (m->uri, &mm->ex);
+	folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex);
 	if (!folder)
 		return;