Init a cancel field in the message. (mail_msg_free): Free it.

2001-01-21  Not Zed  <NotZed@Ximian.com>

        * mail-mt.c (mail_msg_new): Init a cancel field in the message.
        (mail_msg_free): Free it.
        (mail_msg_cancel): New function to attempt to cancel an
        operation by id.  Impelementation functions can still be
        uncancellable by not registering for cancellation, etc, or do it
        themselves as well.

        * mail-send-recv.c (fetch_mail_filter_folder): set folder_uid's
        properly, so we can save it later.
        (filter_folder_filter): Renamed from fetch_mail_filter_folder,
        since its going to be used for all filtering.
        (mail_fetch_mail): Changed from mail_filter_mail.
        (mail_filter_folder): New function, replaces
        mail_do_filter_ondemand functionality.
        (mail_filter_on_demand): New function, actually replaces
        mail_do_filter_ondemand.
        (receive_get_folder): Added an exception arg.
        (mail_send_message): New function to just send a message.
        (send_mail_send): Use mail_send_message.
        (send_queue_send): New send qeue code, use mail_send_message, and
        clean up some stuff.
        (mail_send_receive): Changed from mail_receive.
        (build_dialogue): Setup the sending data, as well.
        (mail_update_subfolders): New function to update folder info.
        (send_mail_send): hook into cancellation if we want.

svn path=/trunk/; revision=7672

1 files changed, 2 insertions, 2 deletions

diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index e924ca0256..aac2e5fedc 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -34,7 +34,7 @@
 static EList *control_list = NULL;
 
 /* this is temporary, remove later -Z */
-void mail_receive(void);
+void mail_send_receive(void);
 
 /*
  * Add with 'folder_browser'
@@ -101,7 +101,7 @@ BonoboUIVerb verbs [] = {
 	BONOBO_UI_UNSAFE_VERB ("MailNext", next_msg),
 	
 	/* This is just very temporary - !Z */
-	BONOBO_UI_UNSAFE_VERB ("MailGetNew", mail_receive),
+	BONOBO_UI_UNSAFE_VERB ("MailGetNew", mail_send_receive),
 
 	BONOBO_UI_VERB_END
 };