From a293a2aa215aea513cf5c88c14f783f224719de8 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 5 Jul 2002 19:38:11 +0000 Subject: No longer need to pass a postpone_cb function into the composer 2002-07-05 Jeffrey Stedfast * main.c (main): No longer need to pass a postpone_cb function into the composer factory_init. * mail-send-recv.c (get_receive_type): If the provider is a transport, return SEND_SEND. * mail-config.c (mail_config_get_default_transport): If the default account doesn't have a transport, find the first account that does. * mail-callbacks.c (append_mail_cleanup): Don't bother freeing the appended_uid here. (composer_send_internal): New helper function that does all the similar work that composer_send_cb and composer_postpone_cb did. (composer_send_cb): Append the message to Outbox and in the async callback, queue a message send operation. (composer_postpone_cb): Removed. (composer_send_queued_cb): The new async callback for composer_send_cb(). If the append is successful, queue a message send operation and destroy the composer otherwise re-show the composer. (save_draft_done): g_strdup the appended uid. (compose_msg): Don't connect to the postpone signal anymore as it no longer exists. (send_to_url): Same. (mail_reply): Here too. (forward_get_composer): And here. (redirect_get_composer): Again here. (do_edit_messages): And finally here. * mail-ops.c (append_mail_free): Free the appended uid. svn path=/trunk/; revision=17379 --- mail/mail-ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 0572f1596d..c43d93a039 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -863,6 +863,7 @@ append_mail_free (struct _mail_msg *mm) camel_object_unref((CamelObject *)m->message); camel_object_unref((CamelObject *)m->folder); + g_free (m->appended_uid); } static struct _mail_msg_op append_mail_op = { @@ -874,7 +875,7 @@ static struct _mail_msg_op append_mail_op = { void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, - void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, char *appended_uid, void *data), + void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, const char *appended_uid, void *data), void *data) { struct _append_msg *m; -- cgit v1.2.3