From 343f36cffe95db2943ba897b83bbb88a6c25c366 Mon Sep 17 00:00:00 2001 From: 3 Date: Tue, 23 Oct 2001 06:28:27 +0000 Subject: Completely re-done. We now hae a completely async dialogue when requested 2001-10-23 * mail-session.c (get_password): Completely re-done. We now hae a completely async dialogue when requested from antoehr thread, and dont use gtk_main() if we can avoid it (which is normally the case). This stuff is only partially finished, and will mena the removal of the same from mail-mt.c, and the mail_user_message() code will be moved here and changed to work in a similar way. * mail-callbacks.c (empty_trash): Dont try and connect to remote stores just to get the trash. Also, always run empty trash async, and make sure we unref the trash. (empty_trash): Hmm, dont unref the trash, causes a problem on exit, i suspect something else is doing funky unrefs on it. * mail-tools.c (mail_tool_get_trash): Pass a 'connect' arg, tell it whether it should tryand connect or not to the parent service, if it isn't already connected. * component-factory.c (owner_unset_cb): Dont try wait_all here, could potentially deadlock. (idle_quit): Keep returning TRUE if we have outstanding processing. Note that this may busy-wait during exit processign with busy tasks :( (idle_quit): Keep calling ourselves till we no longer get called (i.e. gtk_main really quits). * mail-mt.c (mail_msg_active): New function, returns TRUE if events are still active/outstanding. (do_op_status): @$@$#@@!#@!! didn't unlock the mail_msg_lock if data->activity was NULL and we had no global_shell_client anymore! Also shortcut processing if this is going to be the case. (mail_msg_init): Setup a temporary other gui_port for redoing with new semantics password, user message and progress reporting. (mail_get_password): #ifdef'd out all this code temporarily, till it gets fully moved to mail-session.c 2001-10-22 * component-factory.c (owner_set_cb): Dont call enable_interaction here. (interactive_cb): But here instead, let the shell tell us when its ok to go interactive. svn path=/trunk/; revision=13933 --- mail/mail-tools.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'mail/mail-tools.c') diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 96ef278567..383060d2b8 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -93,16 +93,24 @@ mail_tool_get_inbox (const gchar *url, CamelException *ex) } CamelFolder * -mail_tool_get_trash (const gchar *url, CamelException *ex) +mail_tool_get_trash (const gchar *url, int connect, CamelException *ex) { CamelStore *store; CamelFolder *trash; - - store = camel_session_get_store (session, url, ex); + + if (connect) + store = camel_session_get_store (session, url, ex); + else + store = (CamelStore *)camel_session_get_service(session, url, CAMEL_PROVIDER_STORE, ex); + if (!store) return NULL; - trash = camel_store_get_trash (store, ex); + if (connect || ((CamelService *)store)->status == CAMEL_SERVICE_CONNECTED) + trash = camel_store_get_trash (store, ex); + else + trash = NULL; + camel_object_unref (CAMEL_OBJECT (store)); return trash; -- cgit