Updates for CamelStore changes, small memory leak fixes. (lookup_folder):

	* mail-local.c: Updates for CamelStore changes, small memory leak
	fixes.
	(lookup_folder): Removed (and moved into the reconfigure code)
	since this method no longer exists in CamelStore.
	(do_reconfigure_folder, etc): Update the info in the
	MailLocalStore after reconfiguring.
	(mail_local_lookup_folder): Removed

	* local-config.glade: fix padding of the label_format

	* message-list.c (ml_tree_value_at): Don't keep message infos
	reffed across calls, since this can cause badness after a
	reconfigure. Instead, just strdup the needed values and free those
	on the next call.

	* mail-tools.c (mail_tool_get_root_of_store): Unused, remove.
	(mail_tool_get_inbox): use camel_store_get_inbox.

	* evolution-outlook-importer.c (load_file_fn):
	* evolution-mbox-importer.c (load_file_fn): Use
	mail_tool_get_local_inbox() instead of mail_importer_get_folder()

	* mail-importer.c (mail_importer_get_folder): Removed

svn path=/trunk/; revision=8147

1 files changed, 7 insertions, 2 deletions

diff --git a/mail/mail-threads.c b/mail/mail-threads.c
index 4b989bb762..8f0e263765 100644
--- a/mail/mail-threads.c
+++ b/mail/mail-threads.c
@@ -557,9 +557,14 @@ mail_operations_terminate (void)
 	memset (&clur, 0, sizeof (closure_t));
 	clur.spec = NULL;
 
-	pipe_write (DISPATCH_WRITER, &clur, sizeof (closure_t));
+	/* DISPATCH_WRITER will only have been initialized if any
+	 * calls have been made using the old thread system.
+	 */
+	if (DISPATCH_WRITER != -1) {
+		pipe_write (DISPATCH_WRITER, &clur, sizeof (closure_t));
 
-	close (DISPATCH_WRITER);
+		close (DISPATCH_WRITER);
+	}
 	close (MAIN_READER);
 }