Implement account-wide search scope in mail.

Also, let EShellSearchbar handle search state persistence.

1 files changed, 10 insertions, 0 deletions

diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 44a02eddbd..9cdd71d13c 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -28,6 +28,9 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel-disco-store.h>
 #include <camel/camel-offline-store.h>
+#include <camel/camel-operation.h>
+#include <camel/camel-vee-folder.h>
+#include <camel/camel-vee-store.h>
 #include <camel/camel-vtrash-folder.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
 
@@ -58,6 +61,8 @@
 #include "mail-config.h"
 #include "mail-ops.h"
 #include "mail-send-recv.h"
+#include "mail-session.h"
+#include "mail-tools.h"
 #include "mail-vfolder.h"
 #include "message-list.h"
 
@@ -147,6 +152,11 @@ struct _EMailShellViewPrivate {
 	/* EShell::prepare-for-quit */
 	gulong prepare_for_quit_handler_id;
 
+	/* Search folders for interactive search. */
+	CamelVeeFolder *search_account_all;
+	CamelVeeFolder *search_account_current;
+	CamelOperation *search_account_cancel;
+
 	guint show_deleted : 1;
 };