Rename dead files to avoid fpeter's GNOME 2.99 scanner.

Changed foo.dead.c to foo.c.dead and foo.dead.h to foo.h.dead.

1 files changed, 1089 insertions, 0 deletions

diff --git a/mail/em-folder-browser.c.dead b/mail/em-folder-browser.c.dead
new file mode 100644
index 0000000000..8156c4fd32
--- /dev/null
+++ b/mail/em-folder-browser.c.dead
@@ -0,0 +1,1089 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Michael Zucchi <notzed@ximian.com>
+ *      Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+#include <gconf/gconf-client.h>
+
+#ifdef G_OS_WIN32
+/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
+#define DATADIR crap_DATADIR
+#include <windows.h>
+#undef DATADIR
+#undef interface
+#endif
+
+#include "mail-mt.h"
+#include "mail-ops.h"
+#include "mail-tools.h"
+#include "mail-config.h"
+
+#include <e-util/e-dialog-utils.h>
+#include <e-util/e-icon-factory.h>
+
+#include <camel/camel-stream.h>
+#include <camel/camel-url.h>
+#include <camel/camel-folder.h>
+#include <camel/camel-vee-folder.h>
+#include <camel/camel-vee-store.h>
+#include <camel/camel-operation.h>
+
+/* for efilterbar stuff */
+#include <libedataserver/e-sexp.h>
+#include "mail-vfolder.h"
+#include "em-vfolder-rule.h"
+#include "em-folder-tree.h"
+#include <misc/e-filter-bar.h>
+#include <camel/camel-search-private.h>
+#include <camel/camel-store.h>
+
+#include "e-util/e-dialog-utils.h"
+#include "e-util/e-util.h"
+#include "e-util/e-error.h"
+#include "e-util/e-util-private.h"
+#include "e-util/e-util-labels.h"
+#include "e-mail-search-bar.h"
+#include "em-utils.h"
+#include "em-composer-utils.h"
+#include "em-format-html-display.h"
+#include "em-format-html-print.h"
+#include "em-folder-browser.h"
+#include "em-folder-properties.h"
+#include "em-folder-utils.h"
+#include "em-subscribe-editor.h"
+#include "em-menu.h"
+#include "em-event.h"
+#include "message-list.h"
+
+#include "mail-component.h"
+#include "mail-ops.h"
+
+#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
+
+#include <gtkhtml/gtkhtml.h>
+
+extern CamelSession *session;
+CamelStore *vfolder_store; /* the 1 static vfolder store */
+
+#define d(x)
+
+struct _EMFolderBrowserPrivate {
+	GtkWidget *preview;	/* container for message display */
+	GtkWidget *scroll;
+	GtkWidget *search_bar;
+
+	GtkWidget *subscribe_editor;
+
+	guint search_menu_activated_id;
+	guint search_activated_id;
+
+	double default_scroll_position;
+	guint idle_scroll_id;
+	guint list_scrolled_id;
+
+	guint vpane_resize_id;
+	guint list_built_id;	/* hook onto list-built for delayed 'select first unread' stuff */
+
+	gchar *select_uid;
+	guint folder_changed_id;
+
+	guint show_wide:1;
+	guint suppress_message_selection:1;
+	gboolean scope_restricted;
+
+	EMMenu *menu;		/* toplevel menu manager */
+
+	guint labels_change_notify_id; /* mail_config's notify id */
+	guint labels_change_idle_id; /* rebuild menu on idle, when all know about a change */
+};
+
+typedef struct EMFBSearchBarItem {
+	ESearchBarItem search;
+	const gchar *image;
+} EMFBSearchBarItem;
+
+static void emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint state);
+static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
+static void emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri);
+
+/* FilterBar stuff ... */
+static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, gint id, const gchar *query, gpointer data);
+static void emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb);
+static void emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb);
+static void emfb_search_search_cleared(ESearchBar *esb);
+
+static void emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb);
+
+static void emfb_expand_all_threads(BonoboUIComponent *uid, gpointer data, const gchar *path);
+
+static const EMFolderViewEnable emfb_enable_map[] = {
+	{ "EditInvertSelection", EM_POPUP_SELECT_FOLDER },
+	{ "EditSelectAll", EM_POPUP_SELECT_FOLDER },
+	{ "EditSelectThread", EM_FOLDER_VIEW_SELECT_THREADED },
+	{ "EditSelectSubthread", EM_FOLDER_VIEW_SELECT_THREADED },
+	{ "FolderExpunge", EM_POPUP_SELECT_FOLDER },
+	{ "FolderCopy", EM_POPUP_SELECT_FOLDER },
+	{ "FolderMove", EM_POPUP_SELECT_FOLDER },
+	{ "FolderDelete", EM_POPUP_SELECT_FOLDER },
+	{ "FolderRename", EM_POPUP_SELECT_FOLDER },
+	{ "FolderRefresh", EM_POPUP_SELECT_FOLDER },
+	{ "ChangeFolderProperties", EM_POPUP_SELECT_FOLDER },
+	{ "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER },
+	{ "ViewHideSelected", EM_POPUP_SELECT_MANY },
+	{ "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED},
+	{ "ViewThreadsExpandAll", EM_FOLDER_VIEW_SELECT_THREADED},
+	{ NULL },
+};
+
+enum {
+	ACCOUNT_SEARCH_ACTIVATED,
+	ACCOUNT_SEARCH_CLEARED,
+	LAST_SIGNAL
+};
+
+static guint folder_browser_signals [LAST_SIGNAL] = {0, };
+
+enum {
+	ESB_SAVE
+};
+
+static ESearchBarItem emfb_search_items[] = {
+	E_FILTERBAR_ADVANCED,
+	{ NULL, 0, 0 },
+	E_FILTERBAR_SAVE,
+	E_FILTERBAR_EDIT,
+	{ NULL, 0, 0 },
+	{ (gchar *) N_("C_reate Search Folder From Search..."), ESB_SAVE, 0},
+	{ NULL, -1, 0 }
+};
+
+/* IDs and option items for the ESearchBar */
+enum {
+	VIEW_ALL_MESSAGES,
+	VIEW_UNREAD_MESSAGES,
+	VIEW_READ_MESSAGES,
+	VIEW_RECENT_MESSAGES,
+	VIEW_LAST_FIVE_DAYS,
+	VIEW_WITH_ATTACHMENTS,
+	VIEW_NOT_JUNK,
+	VIEW_NO_LABEL,
+	VIEW_LABEL,
+	VIEW_ANY_FIELD_CONTAINS,
+	VIEW_MESSAGES_MARKED_AS_IMPORTANT,
+	VIEW_CUSTOMIZE
+};
+
+/* label IDs are set above this number */
+#define VIEW_ITEMS_MASK 63
+
+static ESearchBarItem emfb_search_scope_items[] = {
+	E_FILTERBAR_CURRENT_FOLDER,
+	E_FILTERBAR_CURRENT_ACCOUNT,
+	E_FILTERBAR_ALL_ACCOUNTS,
+	{ NULL, -1, 0 }
+};
+
+static EMFolderViewClass *emfb_parent;
+
+//static void
+//html_scroll (GtkHTML *html,
+//	GtkOrientation orientation,
+//	GtkScrollType  scroll_type,
+//	gfloat         position,
+//	EMFolderBrowser *emfb)
+//
+//{
+//	if (html->binding_handled || orientation != GTK_ORIENTATION_VERTICAL || !mail_config_get_enable_magic_spacebar ())
+//		return;
+//
+//	if (scroll_type == GTK_SCROLL_PAGE_FORWARD) {
+//		gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list);
+//		message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
+//	} else if (scroll_type == GTK_SCROLL_PAGE_BACKWARD) {
+//		gtk_widget_grab_focus ((GtkWidget *)((EMFolderView *) emfb)->list);
+//		message_list_select(((EMFolderView *) emfb)->list, MESSAGE_LIST_SELECT_NEXT, 0, CAMEL_MESSAGE_SEEN);
+//	}
+//}
+
+static void
+emfb_init(GObject *o)
+{
+	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
+	RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ());
+	struct _EMFolderBrowserPrivate *p;
+	GtkWidget *html;
+
+	EMEvent *eme;
+	EMEventTargetFolderBrowser *target;
+
+	p = emfb->priv = g_malloc0(sizeof(struct _EMFolderBrowserPrivate));
+
+	emfb->view.preview_active = TRUE;
+	emfb->view.list_active = TRUE;
+
+//	g_signal_connect_after (((EMFormatHTML *)(emfb->view.preview))->html, "scroll", G_CALLBACK (html_scroll), emfb);
+
+//	g_slist_foreach (emfb->view.ui_files, free_one_ui_file, NULL);
+//	g_slist_free(emfb->view.ui_files);
+
+//	emfb->view.ui_files = g_slist_append(NULL,
+//					     g_build_filename (EVOLUTION_UIDIR,
+//							       "evolution-mail-global.xml",
+//							       NULL));
+//	emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
+//					     g_build_filename (EVOLUTION_UIDIR,
+//							       "evolution-mail-list.xml",
+//							       NULL));
+//	emfb->view.ui_files = g_slist_append(emfb->view.ui_files,
+//					     g_build_filename (EVOLUTION_UIDIR,
+//							       "evolution-mail-message.xml",
+//							       NULL));
+
+	emfb->view.enable_map = g_slist_prepend(emfb->view.enable_map, (gpointer)emfb_enable_map);
+
+//	if (search_context) {
+//		const gchar *systemrules = g_object_get_data (G_OBJECT (search_context), "system");
+//		const gchar *userrules = g_object_get_data (G_OBJECT (search_context), "user");
+//		EFilterBar *efb;
+//		GConfClient *gconf;
+//
+//		emfb->search = e_filter_bar_new(search_context, systemrules, userrules, emfb_search_config_search, emfb);
+//		efb = (EFilterBar *)emfb->search;
+//		efb->account_search_vf = NULL;
+//		efb->all_account_search_vf = NULL;
+//		efb->account_search_cancel = NULL;
+//		e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
+//		e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
+//		e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE);
+//		emfb->priv->scope_restricted = TRUE;
+//		g_signal_connect(emfb, "realize", G_CALLBACK(emfb_realize), NULL);
+//		gtk_widget_show((GtkWidget *)emfb->search);
+//
+//		p->search_menu_activated_id = g_signal_connect(emfb->search, "menu_activated", G_CALLBACK(emfb_search_menu_activated), emfb);
+//		p->search_activated_id = g_signal_connect(emfb->search, "search_activated", G_CALLBACK(emfb_search_search_activated), emfb);
+//		g_signal_connect(emfb->search, "search_cleared", G_CALLBACK(emfb_search_search_cleared), NULL);
+//
+//		gtk_box_pack_start((GtkBox *)emfb, (GtkWidget *)emfb->search, FALSE, TRUE, 0);
+//
+//		gconf = mail_config_get_gconf_client ();
+//		emfb->priv->labels_change_notify_id = gconf_client_notify_add (gconf, E_UTIL_LABELS_GCONF_KEY, gconf_labels_changed, emfb, NULL, NULL);
+//	}
+//
+//	emfb->priv->show_wide = gconf_client_get_bool(mail_config_get_gconf_client(), "/apps/evolution/mail/display/show_wide", NULL);
+//	emfb->vpane = emfb->priv->show_wide?gtk_hpaned_new():gtk_vpaned_new();
+//
+//	g_signal_connect(emfb->vpane, "realize", G_CALLBACK(emfb_pane_realised), emfb);
+//	emfb->priv->vpane_resize_id = g_signal_connect(emfb->vpane, "button_release_event", G_CALLBACK(emfb_pane_button_release_event), emfb);
+//
+//	gtk_widget_show(emfb->vpane);
+//
+//	gtk_box_pack_start_defaults((GtkBox *)emfb, emfb->vpane);
+//
+//	gtk_paned_pack1 (GTK_PANED (emfb->vpane), GTK_WIDGET (emfb->view.list), FALSE, FALSE);
+//	gtk_widget_show((GtkWidget *)emfb->view.list);
+//
+//	/* currently: just use a scrolledwindow for preview widget */
+//	p->scroll = gtk_scrolled_window_new(NULL, NULL);
+//	gtk_scrolled_window_set_policy((GtkScrolledWindow *)p->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+//	gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)p->scroll, GTK_SHADOW_IN);
+//	gtk_widget_show(p->scroll);
+//
+//	p->preview = gtk_vbox_new (FALSE, 6);
+//	gtk_container_add((GtkContainer *)p->scroll, (GtkWidget *)emfb->view.preview->formathtml.html);
+//	gtk_widget_show((GtkWidget *)emfb->view.preview->formathtml.html);
+//	gtk_box_pack_start ((GtkBox *)p->preview, p->scroll, TRUE, TRUE, 0);
+//	gtk_box_pack_start ((GtkBox *)p->preview, em_format_html_get_search_dialog (emfb->view.preview), FALSE, FALSE, 0);
+//	gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE);
+//	gtk_widget_show(p->preview);
+
+	g_signal_connect_swapped (
+		p->search_bar, "changed",
+		G_CALLBACK (em_format_redraw), emfb->view.preview);
+
+	/** @HookPoint-EMFolderBrower: Folder Browser
+	 * @Id: emfb.created
+	 * @Class: org.gnome.evolution.mail.events:1.0
+	 * @Target: EMFolderBrowser
+	 */
+
+	eme = em_event_peek();
+	target = em_event_target_new_folder_browser (eme, emfb);
+
+	e_event_emit((EEvent *)eme, "emfb.created", (EEventTarget *)target);
+
+	g_signal_connect (((EMFolderView *) emfb)->list, "message_selected", G_CALLBACK (emfb_list_message_selected), emfb);
+
+}
+
+static void
+emfb_destroy(GtkObject *o)
+{
+	EMFolderBrowser *emfb = (EMFolderBrowser *)o;
+
+	if (emfb->priv->list_built_id) {
+		g_signal_handler_disconnect(((EMFolderView *)emfb)->list, emfb->priv->list_built_id);
+		emfb->priv->list_built_id = 0;
+	}
+
+	if (emfb->priv->list_scrolled_id) {
+		g_signal_handler_disconnect (((EMFolderView *) emfb)->list, emfb->priv->list_scrolled_id);
+		emfb->priv->list_scrolled_id = 0;
+	}
+
+	if (emfb->priv->idle_scroll_id) {
+		g_source_remove (emfb->priv->idle_scroll_id);
+		emfb->priv->idle_scroll_id = 0;
+	}
+
+//	if (emfb->view.folder && emfb->priv->folder_changed_id)
+//		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
+
+	if (emfb->priv->labels_change_notify_id) {
+		GConfClient *gconf = mail_config_get_gconf_client ();
+
+		if (gconf)
+			gconf_client_notify_remove (gconf, emfb->priv->labels_change_notify_id);
+
+		emfb->priv->labels_change_notify_id = 0;
+	}
+
+	if (emfb->priv->labels_change_idle_id) {
+		g_source_remove (emfb->priv->labels_change_idle_id);
+
+		emfb->priv->labels_change_idle_id = 0;
+	}
+
+	((GtkObjectClass *)emfb_parent)->destroy(o);
+}
+
+void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state)
+{
+	if ((emfb->view.preview_active ^ state) == 0
+	    || emfb->view.list == NULL) {
+		if (state && emfb->priv->scope_restricted && emfb->view.list->cursor_uid && *(emfb->view.list->cursor_uid)) {
+			emfb->priv->scope_restricted = FALSE;
+		}
+
+		return;
+	}
+
+	emfb->view.preview_active = state;
+
+	if (state) {
+		GConfClient *gconf = mail_config_get_gconf_client ();
+		gint paned_size /*, y*/;
+
+		paned_size = gconf_client_get_int(gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size":"/apps/evolution/mail/display/paned_size", NULL);
+
+		/*y = save_cursor_pos (emfb);*/
+		gtk_paned_set_position (GTK_PANED (emfb->vpane), paned_size);
+		gtk_widget_show (GTK_WIDGET (emfb->priv->preview));
+
+		if (emfb->view.list->cursor_uid) {
+			gchar *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1);
+
+			emfb->priv->scope_restricted = FALSE;
+			strcpy(uid, emfb->view.list->cursor_uid);
+			em_folder_view_set_message(&emfb->view, uid, FALSE);
+		}
+
+		/* need to load/show the current message? */
+		/*do_message_selected (emfb);*/
+		/*set_cursor_pos (emfb, y);*/
+	} else {
+		em_format_format((EMFormat *)emfb->view.preview, NULL, NULL, NULL);
+
+		g_free(emfb->view.displayed_uid);
+		emfb->view.displayed_uid = NULL;
+
+		gtk_widget_hide(emfb->priv->preview);
+		emfb->priv->scope_restricted = TRUE;
+		/*
+		mail_display_set_message (emfb->mail_display, NULL, NULL, NULL);
+		emfb_ui_message_loaded (emfb);*/
+	}
+
+	/* FIXME: need to update menu's to reflect ui changes */
+}
+
+gboolean em_folder_browser_get_wide (EMFolderBrowser *emfb)
+{
+	return emfb->priv->show_wide;
+}
+
+/* ********************************************************************** */
+
+/* FIXME: Need to separate system rules from user ones */
+/* FIXME: Ugh! */
+
+static void
+emfb_search_menu_activated(ESearchBar *esb, gint id, EMFolderBrowser *emfb)
+{
+	EFilterBar *efb = (EFilterBar *)esb;
+
+	d(printf("menu activated\n"));
+
+	switch (id) {
+	case ESB_SAVE:
+		d(printf("Save vfolder\n"));
+		if (efb->current_query) {
+			FilterRule *rule;
+			gchar *name, *text;
+
+			/* ensures vfolder is running */
+			vfolder_load_storage ();
+
+			rule = vfolder_clone_rule (efb->current_query);
+			text = e_search_bar_get_text(esb);
+			name = g_strdup_printf("%s %s", rule->name, (text&&text[0])?text:"''");
+			g_free (text);
+			filter_rule_set_name(rule, name);
+			g_free (name);
+
+			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
+			em_vfolder_rule_add_source((EMVFolderRule *)rule, emfb->view.folder_uri);
+			vfolder_gui_add_rule((EMVFolderRule *)rule);
+		}
+		break;
+	}
+}
+
+struct _setup_msg {
+	MailMsg base;
+
+	CamelFolder *folder;
+	CamelOperation *cancel;
+	GList *sources_uri;
+	GList *sources_folder;
+};
+
+static gchar *
+vfolder_setup_desc(struct _setup_msg *m)
+{
+	return g_strdup(_("Searching"));
+}
+
+static void
+vfolder_setup_exec(struct _setup_msg *m)
+{
+	GList *l, *list = NULL;
+	CamelFolder *folder;
+
+	if (m->cancel)
+		camel_operation_register (m->cancel);
+
+	d(printf("Setting up Search Folder: %s\n", m->folder->full_name));
+
+	l = m->sources_uri;
+	while (l) {
+		d(printf(" Adding uri: %s\n", (gchar *)l->data));
+		folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex);
+		if (folder) {
+			list = g_list_append(list, folder);
+		} else {
+			g_warning("Could not open vfolder source: %s", (gchar *)l->data);
+			camel_exception_clear(&m->base.ex);
+		}
+		l = l->next;
+	}
+
+	l = m->sources_folder;
+	while (l) {
+		d(printf(" Adding folder: %s\n", ((CamelFolder *)l->data)->full_name));
+		camel_object_ref(l->data);
+		list = g_list_append(list, l->data);
+		l = l->next;
+	}
+
+	camel_vee_folder_set_folders((CamelVeeFolder *)m->folder, list);
+
+	l = list;
+	while (l) {
+		camel_object_unref(l->data);
+		l = l->next;
+	}
+	g_list_free(list);
+}
+
+static void
+vfolder_setup_done(struct _setup_msg *m)
+{
+}
+
+static void
+vfolder_setup_free (struct _setup_msg *m)
+{
+	GList *l;
+
+	camel_object_unref(m->folder);
+
+	l = m->sources_uri;
+	while (l) {
+		g_free(l->data);
+		l = l->next;
+	}
+	g_list_free(m->sources_uri);
+
+	l = m->sources_folder;
+	while (l) {
+		camel_object_unref(l->data);
+		l = l->next;
+	}
+	g_list_free(m->sources_folder);
+}
+
+static MailMsgInfo vfolder_setup_info = {
+	sizeof (struct _setup_msg),
+	(MailMsgDescFunc) vfolder_setup_desc,
+	(MailMsgExecFunc) vfolder_setup_exec,
+	(MailMsgDoneFunc) vfolder_setup_done,
+	(MailMsgFreeFunc) vfolder_setup_free
+};
+
+/* sources_uri should be camel uri's */
+static gint
+vfolder_setup (CamelFolder *folder, GList *sources_uri, GList *sources_folder, CamelOperation *cancel)
+{
+	struct _setup_msg *m;
+	gint id;
+
+	m = mail_msg_new(&vfolder_setup_info);
+	m->folder = folder;
+	camel_object_ref(folder);
+	m->sources_uri = sources_uri;
+	m->sources_folder = sources_folder;
+
+	if (cancel) {
+		m->cancel = cancel;
+	}
+
+	id = m->base.seq;
+	mail_msg_slow_ordered_push (m);
+
+	return id;
+}
+
+static void
+emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb)
+{
+	EMFolderView *emfv = (EMFolderView *) emfb;
+	EFilterBar *efb = (EFilterBar *)esb;
+	const gchar *view_sexp;
+	gchar *search_state = NULL, *folder_uri=NULL;
+	gchar *word = NULL, *storeuri = NULL, *search_word = NULL;
+	gint id, i;
+	CamelFolder *folder;
+	CamelStore *store;
+	GPtrArray *folders;
+	GList *folder_list_account = NULL;
+	GList *l, *folder_list = NULL;
+	CamelException *ex;
+	ex = camel_exception_new ();
+
+	if (emfv->list == NULL || emfv->folder == NULL)
+		return;
+
+	id = e_search_bar_get_search_scope (esb);
+
+	switch (id) {
+	    case E_FILTERBAR_CURRENT_FOLDER_ID:
+		    g_object_get (esb, "query", &search_word, NULL);
+		    break;
+
+	    case E_FILTERBAR_CURRENT_ACCOUNT_ID:
+		    word = e_search_bar_get_text (esb);
+		    if (!(word && *word)) {
+			    if (efb->account_search_vf) {
+				    camel_object_unref (efb->account_search_vf);
+				    efb->account_search_vf = NULL;
+				    if (efb->account_search_cancel) {
+					    camel_operation_cancel (efb->account_search_cancel);
+					    camel_operation_unref (efb->account_search_cancel);
+					    efb->account_search_cancel = NULL;
+				    }
+			    }
+			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
+			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);
+			    g_free (word);
+			    word = NULL;
+			    break;
+		    }
+
+		    g_free (word);
+		    word = NULL;
+		    g_object_get (esb, "query", &search_word, NULL);
+		    if (search_word && efb->account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->account_search_vf)->expression) ) {
+			    break;
+		    }
+		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);
+
+		    /* Disable the folder tree */
+		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
+
+		    if (!efb->account_search_vf) {
+			    store = emfv->folder->parent_store;
+			    if (store->folders) {
+				    folders = camel_object_bag_list(store->folders);
+				    for (i=0;i<folders->len;i++) {
+					    folder = folders->pdata[i];
+					    folder_list_account = g_list_append(folder_list_account, folder);
+				    }
+			    }
+
+			    /* Create a camel vee folder */
+			    storeuri = g_strdup_printf("vfolder:%s/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
+			    vfolder_store = camel_session_get_store (session, storeuri, NULL);
+			    efb->account_search_vf = (CamelVeeFolder *)camel_vee_folder_new (vfolder_store,_("Account Search"),CAMEL_STORE_VEE_FOLDER_AUTO);
+
+			    /* Set the search expression  */
+			    camel_vee_folder_set_expression (efb->account_search_vf, search_word);
+
+			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
+			    vfolder_setup ((CamelFolder *)efb->account_search_vf, NULL, folder_list_account, efb->account_search_cancel);
+
+			    folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->account_search_vf);
+			    emfb_set_search_folder (emfv, (CamelFolder *)efb->account_search_vf, folder_uri);
+			    g_free (folder_uri);
+			    g_free (storeuri);
+		    } else {
+			    /* cancel previous filling first, if under way */
+			    if (efb->account_search_cancel) {
+				    camel_operation_cancel (efb->account_search_cancel);
+				    camel_operation_unref (efb->account_search_cancel);
+				    efb->account_search_cancel = NULL;
+			    }
+
+			    /* Reuse the existing search folder */
+			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->account_search_vf, search_word);
+		    }
+
+		    break;
+
+	    case E_FILTERBAR_ALL_ACCOUNTS_ID:
+		    word = e_search_bar_get_text (esb);
+		    if (!(word && *word)) {
+			    if (efb->all_account_search_vf) {
+				    camel_object_unref (efb->all_account_search_vf);
+				    efb->all_account_search_vf=NULL;
+				    if (efb->account_search_cancel) {
+					    camel_operation_cancel (efb->account_search_cancel);
+					    camel_operation_unref (efb->account_search_cancel);
+					    efb->account_search_cancel = NULL;
+				    }
+			    }
+			    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_CLEARED], 0);
+			    gtk_widget_set_sensitive (esb->scopeoption, TRUE);
+			    g_free (word);
+			    word = NULL;
+			    break;
+		    }
+
+		    g_free (word);
+		    word = NULL;
+
+		    g_object_get (esb, "query", &search_word, NULL);
+
+		    if (search_word && efb->all_account_search_vf && !strcmp (search_word, ((CamelVeeFolder *) efb->all_account_search_vf)->expression) )  {
+			    /* No real search apart from the existing one */
+			    break;
+		    }
+
+		    gtk_widget_set_sensitive (esb->scopeoption, FALSE);
+		    g_signal_emit (emfb, folder_browser_signals [ACCOUNT_SEARCH_ACTIVATED], 0);
+
+		    if (!efb->all_account_search_vf) {
+			    /* Create a camel vee folder */
+			    storeuri = g_strdup_printf("vfolder:%s/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
+			    vfolder_store = camel_session_get_store (session, storeuri, NULL);
+			    efb->all_account_search_vf = (CamelVeeFolder *)camel_vee_folder_new (vfolder_store,_("All Account Search"),CAMEL_STORE_VEE_FOLDER_AUTO);
+
+			    /* Set sexp  */
+
+			    /* FIXME: there got to be a better way :) */
+
+			    /* Add the local folders */
+			    l = mail_vfolder_get_sources_local ();
+			    while (l) {
+				    folder = mail_tool_uri_to_folder ((const gchar *)l->data, 0,ex);
+				    if (folder)
+					    folder_list = g_list_append(folder_list, folder);
+				    else {
+					    g_warning("Could not open vfolder source: %s", (gchar *)l->data);
+					    camel_exception_clear(ex);
+				    }
+				    l = l->next;
+			    }
+
+			    /* Add the remote source folder */
+			    l = mail_vfolder_get_sources_remote ();
+			    while (l) {
+				    folder = mail_tool_uri_to_folder ((const gchar *)l->data, 0,ex);
+				    if (folder)
+					    folder_list = g_list_append(folder_list, folder);
+				    else {
+					    g_warning("Could not open vfolder source: %s", (gchar *)l->data);
+					    camel_exception_clear(ex);
+				    }
+				    l = l->next;
+			    }
+
+			    camel_vee_folder_set_expression (efb->all_account_search_vf, search_word);
+
+			    efb->account_search_cancel = camel_operation_new (NULL, NULL);
+			    vfolder_setup ((CamelFolder *)efb->all_account_search_vf, NULL, folder_list, efb->account_search_cancel);
+
+			    folder_uri = mail_tools_folder_to_url ((CamelFolder *)efb->all_account_search_vf);
+
+			    emfb_set_search_folder (emfv, (CamelFolder *)efb->all_account_search_vf, folder_uri);
+			    g_free (folder_uri);
+			    g_free (storeuri);
+		    } else {
+			    /* cancel previous filling first, if under way */
+			    if (efb->account_search_cancel) {
+				    camel_operation_cancel (efb->account_search_cancel);
+				    camel_operation_unref (efb->account_search_cancel);
+				    efb->account_search_cancel = NULL;
+			    }
+
+			    /* Reuse the existing search folder */
+			    camel_vee_folder_set_expression((CamelVeeFolder *)efb->all_account_search_vf, search_word);
+		    }
+
+		    break;
+	}
+	g_object_get (esb, "state", &search_state, NULL);
+	camel_object_meta_set (emfv->folder, "evolution:search_state", search_state);
+	camel_object_state_write (emfv->folder);
+	g_free (search_state);
+
+	if (search_word) {
+		g_free (search_word);
+		search_word = NULL;
+	}
+
+	/* Merge the view and search expresion*/
+	view_sexp = get_view_query (esb, emfv->folder, emfv->folder_uri);
+	g_object_get (esb, "query", &search_word, NULL);
+
+	word = search_word;
+
+	if (search_word && *search_word)
+		search_word = g_strconcat ("(and ", view_sexp, search_word, " )", NULL);
+	else
+		search_word = g_strdup (view_sexp);
+
+	message_list_set_search(emfb->view.list, search_word);
+
+	g_free (word);
+	g_free (search_word);
+
+	camel_exception_free (ex);
+}
+
+static void
+emfb_search_search_cleared(ESearchBar *esb)
+{
+	/* FIXME: It should just cancel search.*/
+	mail_cancel_all();
+}
+
+/* ********************************************************************** */
+
+static void
+emfb_list_message_selected (MessageList *ml, const gchar *uid, EMFolderBrowser *emfb)
+{
+	EMFolderView *emfv = (EMFolderView *) emfb;
+
+	if (emfv->folder == NULL)
+		return;
+
+	if (uid && *uid && emfb->priv->scope_restricted && emfb->view.preview_active) {
+		emfb->priv->scope_restricted = FALSE;
+	} else if ( !(uid && *uid) && !emfb->priv->scope_restricted) {
+		emfb->priv->scope_restricted = TRUE;
+	}
+
+	camel_object_meta_set (emfv->folder, "evolution:selected_uid", uid);
+	camel_object_state_write (emfv->folder);
+	g_free (emfb->priv->select_uid);
+	emfb->priv->select_uid = NULL;
+}
+
+/* ********************************************************************** */
+
+static void
+emfb_focus_search(BonoboUIComponent *uid, gpointer data, const gchar *path)
+{
+	EMFolderBrowser *emfb = data;
+
+	gtk_widget_grab_focus (((ESearchBar *)emfb->search)->entry);
+}
+
+static void
+emfb_help_debug (BonoboUIComponent *uid, gpointer data, const gchar *path)
+{
+	mail_component_show_logger ((GtkWidget *) data);
+}
+
+static BonoboUIVerb emfb_verbs[] = {
+	BONOBO_UI_UNSAFE_VERB ("HelpDebug", emfb_help_debug),
+
+	BONOBO_UI_UNSAFE_VERB ("FocusSearch", emfb_focus_search),
+
+	/* ViewPreview is a toggle */
+
+	BONOBO_UI_VERB_END
+};
+
+//static gboolean
+//emfb_select_all_daemon (MessageList *ml)
+//{
+//		message_list_select_all(ml);
+//		gtk_widget_grab_focus ((GtkWidget *)ml);
+//		return FALSE;
+//}
+
+//static void
+//emfb_hide_deleted(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data)
+//{
+//	GConfClient *gconf;
+//	EMFolderView *emfv = data;
+//
+//	if (type != Bonobo_UIComponent_STATE_CHANGED)
+//		return;
+//
+//	gconf = mail_config_get_gconf_client ();
+//	gconf_client_set_bool(gconf, "/apps/evolution/mail/display/show_deleted", state[0] == '0', NULL);
+//	em_folder_view_set_hide_deleted(emfv, state[0] != '0');
+//}
+
+static void
+emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri)
+{
+	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
+	gchar *state;
+
+	message_list_freeze(emfv->list);
+
+	if (emfb->priv->list_scrolled_id) {
+		g_signal_handler_disconnect (emfv->list, emfb->priv->list_scrolled_id);
+		emfb->priv->list_scrolled_id = 0;
+	}
+
+	if (emfb->priv->idle_scroll_id) {
+		g_source_remove (emfb->priv->idle_scroll_id);
+		emfb->priv->idle_scroll_id = 0;
+	}
+
+//	if (emfb->view.folder) {
+//		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
+//		emfb->priv->folder_changed_id = 0;
+//	}
+
+	emfb_parent->set_folder(emfv, folder, uri);
+
+	/* etspec for search results */
+	state = "<ETableState>"
+		"<column source=\"0\"/> <column source=\"3\"/> <column source=\"1\"/>"
+		"<column source=\"14\"/> <column source=\"5\"/>"
+		"<column source=\"7\"/> <column source=\"13\"/> "
+		"<grouping><leaf column=\"7\" ascending=\"false\"/> </grouping> </ETableState>";
+	e_tree_set_state (((MessageList *)emfv->list)->tree, state);
+
+	message_list_thaw(emfv->list);
+}
+
+static void
+emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri)
+{
+	EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
+	struct _EMFolderBrowserPrivate *p = emfb->priv;
+	gboolean different_folder;
+
+//	message_list_freeze(emfv->list);
+
+	if (emfb->priv->list_scrolled_id) {
+		g_signal_handler_disconnect (emfv->list, emfb->priv->list_scrolled_id);
+		emfb->priv->list_scrolled_id = 0;
+	}
+
+	if (emfb->priv->idle_scroll_id) {
+		g_source_remove (emfb->priv->idle_scroll_id);
+		emfb->priv->idle_scroll_id = 0;
+	}
+
+//	if (emfb->view.folder && emfb->priv->folder_changed_id) {
+//		camel_object_remove_event(emfb->view.folder, emfb->priv->folder_changed_id);
+//		emfb->priv->folder_changed_id = 0;
+//	}
+//
+//	different_folder =
+//		emfb->view.folder != NULL &&
+//		folder != emfb->view.folder;
+//
+//	emfb_parent->set_folder(emfv, folder, uri);
+
+	/* This is required since we get activated the first time
+	   before the folder is open and need to override the
+	   defaults */
+	if (folder) {
+		gchar *sstate;
+		gint state;
+		gboolean safe;
+		GConfClient *gconf = mail_config_get_gconf_client();
+
+		safe = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/safe_list", NULL);
+		if (safe) {
+			if (camel_object_meta_set(emfv->folder, "evolution:show_preview", "0") &&
+			    camel_object_meta_set(emfv->folder, "evolution:selected_uid", NULL)) {
+				camel_object_state_write(emfv->folder);
+				g_free (emfb->priv->select_uid);
+				emfb->priv->select_uid = NULL;
+			}
+			gconf_client_set_bool (gconf, "/apps/evolution/mail/display/safe_list", FALSE, NULL);
+		}
+
+//		mail_refresh_folder(folder, NULL, NULL);
+//
+//		emfb->priv->folder_changed_id = camel_object_hook_event(folder, "folder_changed",
+//									(CamelObjectEventHookFunc)emfb_folder_changed, emfb);
+//
+//		/* FIXME: this mostly copied from activate() */
+//		if ((sstate = camel_object_meta_get(folder, "evolution:show_preview"))) {
+//			state = sstate[0] != '0';
+//			g_free(sstate);
+//		} else
+//			state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_preview", NULL);
+//		em_folder_browser_show_preview(emfb, state);
+//		if (emfv->uic)
+//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
+//
+//		if ((sstate = camel_object_meta_get(folder, "evolution:thread_list"))) {
+//			state = sstate[0] != '0';
+//			g_free(sstate);
+//		} else
+//			state = gconf_client_get_bool(gconf, "/apps/evolution/mail/display/thread_list", NULL);
+//		message_list_set_threaded(emfv->list, state);
+//		if (emfv->uic) {
+//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreaded", "state", state?"1":"0", NULL);
+//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreadsCollapseAll", "sensitive", state?"1":"0", NULL);
+//			bonobo_ui_component_set_prop(emfv->uic, "/commands/ViewThreadsExpandAll", "sensitive", state?"1":"0", NULL);
+//		}
+
+		if (emfv->uic) {
+			state = (folder->folder_flags & CAMEL_FOLDER_IS_TRASH) == 0;
+			bonobo_ui_component_set_prop(emfv->uic, "/commands/HideDeleted", "sensitive", state?"1":"0", NULL);
+		}
+
+		/* Fixme */
+		sstate = camel_object_meta_get(folder, "evolution:search_state");
+		if (sstate) {
+			g_object_set(emfb->search, "state", sstate, NULL);
+			g_free(sstate);
+		} else {
+			gboolean outgoing;
+			outgoing = em_utils_folder_is_drafts (emfv->folder, emfv->folder_uri)
+				|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
+				|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
+
+			e_search_bar_set_text ((ESearchBar *)emfb->search, "");
+
+			if (outgoing) {
+				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 1);
+				((ESearchBar *)emfb->search)->block_search = TRUE;
+				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 1);
+				((ESearchBar *)emfb->search)->block_search = FALSE;
+
+			} else {
+				e_search_bar_set_item_id ((ESearchBar *)emfb->search, 0);
+				((ESearchBar *)emfb->search)->block_search = TRUE;
+				e_search_bar_set_item_menu ((ESearchBar *)emfb->search, 0);
+				((ESearchBar *)emfb->search)->block_search = FALSE;
+
+			}
+			e_search_bar_paint ((ESearchBar *)emfb->search);
+		}
+
+//		/* This function gets triggered several times at startup,
+//		 * so we don't want to reset the message suppression state
+//		 * unless we're actually switching to a different folder. */
+//		if (different_folder)
+//			p->suppress_message_selection = FALSE;
+//
+//		if (!p->suppress_message_selection)
+//			sstate = camel_object_meta_get (
+//				folder, "evolution:selected_uid");
+//		else
+//			sstate = NULL;
+//
+//		g_free (p->select_uid);
+//		p->select_uid = sstate;
+//
+//		if (emfv->list->cursor_uid == NULL && emfb->priv->list_built_id == 0)
+//			p->list_built_id = g_signal_connect(emfv->list, "message_list_built", G_CALLBACK (emfb_list_built), emfv);
+//	}
+//
+//	message_list_thaw(emfv->list);
+}
+
+static void
+emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
+{
+	if (act) {
+		GConfClient *gconf;
+		gboolean state;
+		gchar *sstate;
+		EMFolderBrowser *emfb = (EMFolderBrowser *) emfv;
+
+		/* Stop button */
+		state = mail_msg_active((guint)-1);
+		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL);
+
+//		/* HideDeleted */
+//		state = !gconf_client_get_bool(gconf, "/apps/evolution/mail/display/show_deleted", NULL);
+//		if (emfv->folder && (emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) {
+//			state = FALSE;
+//			bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "sensitive", "0", NULL);
+//		} else
+//			bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "sensitive", "1", NULL);
+//		bonobo_ui_component_set_prop(uic, "/commands/HideDeleted", "state", state ? "1" : "0", NULL);
+//		bonobo_ui_component_add_listener(uic, "HideDeleted", emfb_hide_deleted, emfv);
+//		em_folder_view_set_hide_deleted(emfv, state); /* <- not sure if this optimal, but it'll do */
+	}
+}
+
+void
+em_folder_browser_suppress_message_selection (EMFolderBrowser *emfb)
+{
+	emfb->priv->suppress_message_selection = TRUE;
+}