This commit was manufactured by cvs2svn to create tag 'pan-0-11-94'.pan-0-11-94

svn path=/tags/pan-0-11-94/; revision=16911

1 files changed, 0 insertions, 2496 deletions

diff --git a/mail/folder-browser.c b/mail/folder-browser.c
deleted file mode 100644
index b5d87685eb..0000000000
--- a/mail/folder-browser.c
+++ /dev/null
@@ -1,2496 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Miguel De Icaza <miguel@ximian.com>
- *           Jeffrey Stedfast <fejj@ximian.com>
- *
- *  Copyright 2000,2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <ctype.h>
-#include <errno.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkinvisible.h>
-#include <gal/e-paned/e-vpaned.h>
-#include <gal/e-table/e-table.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-pixmap.h>
-
-#include <gtkhtml/htmlengine.h>
-#include <gtkhtml/htmlobject.h>
-#include <gtkhtml/htmlinterval.h>
-#include <gtkhtml/htmlengine-edit-cut-and-paste.h>
-
-#include "filter/vfolder-rule.h"
-#include "filter/vfolder-context.h"
-#include "filter/filter-option.h"
-#include "filter/filter-input.h"
-
-#include "mail-search-dialogue.h"
-#include "e-util/e-sexp.h"
-#include "e-util/e-mktemp.h"
-#include "folder-browser.h"
-#include "e-searching-tokenizer.h"
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-#include "folder-browser-ui.h"
-#include "message-tag-followup.h"
-
-#include "mail-local.h"
-#include "mail-config.h"
-
-#include <camel/camel-mime-message.h>
-#include <camel/camel-stream-mem.h>
-
-#define d(x) 
-
-#define PARENT_TYPE (gtk_table_get_type ())
-
-static void folder_changed(CamelObject *o, void *event_data, void *data);
-static void main_folder_changed(CamelObject *o, void *event_data, void *data);
-
-#define X_EVOLUTION_MESSAGE_TYPE "x-evolution-message"
-#define MESSAGE_RFC822_TYPE      "message/rfc822"
-#define TEXT_URI_LIST_TYPE       "text/uri-list"
-#define TEXT_PLAIN_TYPE          "text/plain"
-
-/* Drag & Drop types */
-enum DndTargetType {
-	DND_TARGET_TYPE_X_EVOLUTION_MESSAGE,
-	DND_TARGET_TYPE_MESSAGE_RFC822,
-	DND_TARGET_TYPE_TEXT_URI_LIST,
-};
-
-static GtkTargetEntry drag_types[] = {
-	{ X_EVOLUTION_MESSAGE_TYPE, 0, DND_TARGET_TYPE_X_EVOLUTION_MESSAGE },
-	{ MESSAGE_RFC822_TYPE, 0, DND_TARGET_TYPE_MESSAGE_RFC822 },
-	{ TEXT_URI_LIST_TYPE, 0, DND_TARGET_TYPE_TEXT_URI_LIST },
-};
-
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-enum PasteTargetType {
-	PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE,
-	PASTE_TARGET_TYPE_TEXT_PLAIN,
-};
-
-static GtkTargetPair paste_types[] = {
-	{ 0, 0, PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE },
-	{ GDK_SELECTION_TYPE_STRING, 0, PASTE_TARGET_TYPE_TEXT_PLAIN },
-};
-
-static const int num_paste_types = sizeof (paste_types) / sizeof (paste_types[0]);
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-static GtkObjectClass *folder_browser_parent_class;
-
-enum {
-	FOLDER_LOADED,
-	MESSAGE_LOADED,
-	LAST_SIGNAL
-};
-
-static guint folder_browser_signals [LAST_SIGNAL] = {0, };
-
-static void
-folder_browser_finalise (GtkObject *object)
-{
-	FolderBrowser *folder_browser;
-	CORBA_Environment ev;
-	
-	folder_browser = FOLDER_BROWSER (object);
-	
-	CORBA_exception_init (&ev);
-	
-	g_free (folder_browser->loading_uid);
-	g_free (folder_browser->pending_uid);
-	g_free (folder_browser->new_uid);
-	g_free (folder_browser->loaded_uid);
-	
-	if (folder_browser->search_full)
-		gtk_object_unref (GTK_OBJECT (folder_browser->search_full));
-	
-	if (folder_browser->sensitize_timeout_id)
-		g_source_remove (folder_browser->sensitize_timeout_id);
-	
-	if (folder_browser->shell != CORBA_OBJECT_NIL) {
-		CORBA_Object_release (folder_browser->shell, &ev);
-		folder_browser->shell = CORBA_OBJECT_NIL;
-	}
-	
-	if (folder_browser->shell_view != CORBA_OBJECT_NIL) {
-		CORBA_Object_release(folder_browser->shell_view, &ev);
-		folder_browser->shell_view = CORBA_OBJECT_NIL;
-	}
-	
-	if (folder_browser->uicomp)
-		bonobo_object_unref (BONOBO_OBJECT (folder_browser->uicomp));
-	
-	g_free (folder_browser->uri);
-	folder_browser->uri = NULL;
-	
-	CORBA_exception_free (&ev);
-	
-	if (folder_browser->view_instance) {
-		gtk_object_unref (GTK_OBJECT (folder_browser->view_instance));
-		folder_browser->view_instance = NULL;
-	}
-	
-	if (folder_browser->view_menus) {
-		gtk_object_unref (GTK_OBJECT (folder_browser->view_menus));
-		folder_browser->view_menus = NULL;
-	}
-	
-	gtk_object_unref (GTK_OBJECT (folder_browser->invisible));
-	folder_browser->invisible = NULL;
-	
-	if (folder_browser->clipboard_selection)
-		g_byte_array_free (folder_browser->clipboard_selection, TRUE);
-	
-	if (folder_browser->sensitise_state) {
-		g_hash_table_destroy(folder_browser->sensitise_state);
-		folder_browser->sensitise_state = NULL;
-	}
-	
-	folder_browser_parent_class->finalize (object);
-}
-
-static void
-folder_browser_destroy (GtkObject *object)
-{
-	FolderBrowser *folder_browser;
-	
-	folder_browser = FOLDER_BROWSER (object);
-	
-	if (folder_browser->seen_id != 0) {
-		gtk_timeout_remove (folder_browser->seen_id);
-		folder_browser->seen_id = 0;
-	}
-	
-	if (folder_browser->loading_id != 0) {
-		gtk_timeout_remove(folder_browser->loading_id);
-		folder_browser->loading_id = 0;
-	}
-	
-	if (folder_browser->message_list) {
-		gtk_widget_destroy (GTK_WIDGET (folder_browser->message_list));
-		folder_browser->message_list = NULL;
-	}
-	
-	if (folder_browser->mail_display) {
-		gtk_widget_destroy (GTK_WIDGET (folder_browser->mail_display));
-		folder_browser->mail_display = NULL;
-	}
-	
-	/* wait for all outstanding async events against us */
-	mail_async_event_destroy (folder_browser->async_event);
-	
-	if (folder_browser->get_id != -1) {
-		mail_msg_cancel(folder_browser->get_id);
-		folder_browser->get_id = -1;
-	}
-	
-	if (folder_browser->folder) {
-		camel_object_unhook_event (CAMEL_OBJECT (folder_browser->folder), "folder_changed",
-					   folder_changed, folder_browser);
-		camel_object_unhook_event (CAMEL_OBJECT (folder_browser->folder), "message_changed",
-					   folder_changed, folder_browser);
-		mail_sync_folder (folder_browser->folder, NULL, NULL);
-		camel_object_unref (CAMEL_OBJECT (folder_browser->folder));
-		folder_browser->folder = NULL;
-	}
-	
-	folder_browser_parent_class->destroy (object);
-}
-
-static void
-folder_browser_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = folder_browser_destroy;
-	object_class->finalize = folder_browser_finalise;
-	
-	folder_browser_parent_class = gtk_type_class (PARENT_TYPE);
-	
-	folder_browser_signals[FOLDER_LOADED] =
-		gtk_signal_new ("folder_loaded",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (FolderBrowserClass, folder_loaded),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-	
-	folder_browser_signals[MESSAGE_LOADED] =
-		gtk_signal_new ("message_loaded",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (FolderBrowserClass, message_loaded),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-	
-	gtk_object_class_add_signals (object_class, folder_browser_signals, LAST_SIGNAL);
-	
-	/* clipboard atom */
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-	
-	if (!paste_types[0].target)
-		paste_types[0].target = gdk_atom_intern (X_EVOLUTION_MESSAGE_TYPE, FALSE);
-}
-
-static void
-add_uid (MessageList *ml, const char *uid, gpointer data)
-{
-	g_ptr_array_add ((GPtrArray *) data, g_strdup (uid));
-}
-
-static void
-message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col,
-			    GdkDragContext *context, GtkSelectionData *selection_data,
-			    guint info, guint time, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	GPtrArray *uids = NULL;
-	int i;
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, add_uid, uids);
-	if (uids->len == 0) {
-		g_ptr_array_free (uids, TRUE);
-		return;
-	}
-	
-	switch (info) {
-	case DND_TARGET_TYPE_TEXT_URI_LIST:
-	{
-		const char *filename, *tmpdir;
-		CamelMimeMessage *message;
-		CamelStream *stream;
-		char *uri_list;
-		int fd;
-		
-		tmpdir = e_mkdtemp ("drag-n-drop-XXXXXX");
-		
-		if (!tmpdir) {
-			char *msg = g_strdup_printf (_("Could not create temporary "
-						       "directory: %s"),
-						     g_strerror (errno));
-			gnome_error_dialog (msg);
-			/* cleanup and abort */
-			for (i = 0; i < uids->len; i++)
-				g_free (uids->pdata[i]);
-			g_ptr_array_free (uids, TRUE);
-			g_free (msg);
-			return;
-		}
-		
-		message = camel_folder_get_message (fb->folder, uids->pdata[0], NULL);
-		g_free (uids->pdata[0]);
-		
-		if (uids->len == 1) {
-			filename = camel_mime_message_get_subject (message);
-			if (!filename)
-				filename = _("Unknown");
-		} else
-			filename = "mbox";
-		
-		uri_list = g_strdup_printf ("file://%s/%s", tmpdir, filename);
-		
-		fd = open (uri_list + 7, O_WRONLY | O_CREAT);
-		if (fd == -1) {
-			/* cleanup and abort */
-			camel_object_unref (CAMEL_OBJECT (message));
-			for (i = 1; i < uids->len; i++)
-				g_free (uids->pdata[i]);
-			g_ptr_array_free (uids, TRUE);
-			g_free (uri_list);
-			return;
-		}
-		
-		stream = camel_stream_fs_new_with_fd (fd);
-		
-		camel_stream_write (stream, "From - \n", 8);
-		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-		camel_object_unref (CAMEL_OBJECT (message));
-		for (i = 1; i < uids->len; i++) {
-			message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL);
-			camel_stream_write (stream, "From - \n", 8);
-			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-			camel_object_unref (CAMEL_OBJECT (message));
-			g_free (uids->pdata[i]);
-		}
-		
-		camel_object_unref (CAMEL_OBJECT (stream));
-		
-		gtk_selection_data_set (selection_data, selection_data->target, 8,
-					uri_list, strlen (uri_list));
-		g_free (uri_list);
-	}
-	break;
-	case DND_TARGET_TYPE_MESSAGE_RFC822:
-	{
-		/* FIXME: this'll be fucking slow for the user... pthread this? */
-		CamelStream *stream;
-		GByteArray *bytes;
-		
-		bytes = g_byte_array_new ();
-		stream = camel_stream_mem_new ();
-		camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), bytes);
-		
-		for (i = 0; i < uids->len; i++) {
-			CamelMimeMessage *message;
-			
-			message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL);
-			g_free (uids->pdata[i]);
-			
-			if (message) {			
-				camel_stream_write (stream, "From - \n", 8);
-				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-				camel_object_unref (CAMEL_OBJECT (message));
-			}
-		}
-		
-		g_ptr_array_free (uids, TRUE);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		
-		gtk_selection_data_set (selection_data, selection_data->target, 8,
-					bytes->data, bytes->len);
-		
-		g_byte_array_free (bytes, TRUE);
-	}
-	break;
-	case DND_TARGET_TYPE_X_EVOLUTION_MESSAGE:
-	{
-		GByteArray *array;
-		
-		/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */
-		
-		/* write the uri portion */
-		array = g_byte_array_new ();
-		g_byte_array_append (array, fb->uri, strlen (fb->uri));
-		g_byte_array_append (array, "", 1);
-		
-		/* write the uids */
-		for (i = 0; i < uids->len; i++) {
-			g_byte_array_append (array, uids->pdata[i], strlen (uids->pdata[i]));
-			g_free (uids->pdata[i]);
-			
-			if (i + 1 < uids->len)
-				g_byte_array_append (array, "", 1);
-		}
-		
-		g_ptr_array_free (uids, TRUE);
-		
-		gtk_selection_data_set (selection_data, selection_data->target, 8,
-					array->data, array->len);
-		
-		g_byte_array_free (array, TRUE);
-	}
-	break;
-	default:
-		for (i = 0; i < uids->len; i++)
-			g_free (uids->pdata[i]);
-		
-		g_ptr_array_free (uids, TRUE);
-		break;
-	}
-}
-
-static void
-message_rfc822_dnd (CamelFolder *dest, CamelStream *stream, CamelException *ex)
-{
-	CamelMimeParser *mp;
-	
-	mp = camel_mime_parser_new ();
-	camel_mime_parser_scan_from (mp, TRUE);
-	camel_mime_parser_init_with_stream (mp, stream);
-	
-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {
-		CamelMessageInfo *info;
-		CamelMimeMessage *msg;
-		
-		msg = camel_mime_message_new ();
-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {
-			camel_object_unref (CAMEL_OBJECT (msg));
-			break;
-		}
-		
-		/* append the message to the folder... */
-		info = g_new0 (CamelMessageInfo, 1);
-		camel_folder_append_message (dest, msg, info, NULL, ex);
-		camel_object_unref (CAMEL_OBJECT (msg));
-		
-		if (camel_exception_is_set (ex))
-			break;
-		
-		/* skip over the FROM_END state */
-		camel_mime_parser_step (mp, 0, 0);
-	}
-	
-	camel_object_unref (CAMEL_OBJECT (mp));
-}
-
-static void
-message_list_drag_data_received (ETree *tree, int row, ETreePath path, int col,
-				 GdkDragContext *context, gint x, gint y,
-				 GtkSelectionData *selection_data, guint info,
-				 guint time, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	CamelFolder *folder = NULL;
-	char *tmp, *url, **urls;
-	GPtrArray *uids = NULL;
-	CamelStream *stream;
-	CamelException ex;
-	CamelURL *uri;
-	int i, fd;
-	
-	/* this means we are receiving no data */
-	if (!selection_data->data || selection_data->length == -1)
-		return;
-	
-	camel_exception_init (&ex);
-	
-	switch (info) {
-	case DND_TARGET_TYPE_TEXT_URI_LIST:
-		tmp = g_strndup (selection_data->data, selection_data->length);
-		urls = g_strsplit (tmp, "\n", 0);
-		g_free (tmp);
-		
-		for (i = 0; urls[i] != NULL; i++) {
-			/* get the path component */
-			url = g_strstrip (urls[i]);
-			
-			uri = camel_url_new (url, NULL);
-			g_free (url);
-			url = uri->path;
-			uri->path = NULL;
-			camel_url_free (uri);
-			
-			fd = open (url, O_RDONLY);
-			if (fd == -1) {
-				g_free (url);
-				/* FIXME: okay, what do we do in this case? */
-				continue;
-			}
-			
-			stream = camel_stream_fs_new_with_fd (fd);
-			message_rfc822_dnd (fb->folder, stream, &ex);
-			camel_object_unref (CAMEL_OBJECT (stream));
-			
-			if (context->action == GDK_ACTION_MOVE && !camel_exception_is_set (&ex))
-				unlink (url);
-			
-			g_free (url);
-		}
-		
-		g_free (urls);
-		break;
-	case DND_TARGET_TYPE_MESSAGE_RFC822:
-		/* write the message(s) out to a CamelStream so we can use it */
-		stream = camel_stream_mem_new ();
-		camel_stream_write (stream, selection_data->data, selection_data->length);
-		camel_stream_reset (stream);
-		
-		message_rfc822_dnd (fb->folder, stream, &ex);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		break;
-	case DND_TARGET_TYPE_X_EVOLUTION_MESSAGE:
-		folder = mail_tools_x_evolution_message_parse (selection_data->data, selection_data->length, &uids);
-		if (folder == NULL)
-			goto fail;
-		
-		if (uids == NULL) {
-			camel_object_unref (CAMEL_OBJECT (folder));
-			goto fail;
-		}
-		
-		mail_transfer_messages (folder, uids, context->action == GDK_ACTION_MOVE,
-					fb->uri, 0, NULL, NULL);
-		
-		camel_object_unref (CAMEL_OBJECT (folder));
-		break;
-	}
-	
-	camel_exception_clear (&ex);
-	
-	gtk_drag_finish (context, TRUE, TRUE, GDK_CURRENT_TIME);
-	
- fail:
-	camel_exception_clear (&ex);
-	
-	gtk_drag_finish (context, FALSE, TRUE, GDK_CURRENT_TIME);
-}
-
-static void
-selection_get (GtkWidget *widget, GtkSelectionData *selection_data,
-	       guint info, guint time_stamp, FolderBrowser *fb)
-{
-	if (fb->clipboard_selection == NULL)
-		return;
-	
-	switch (info) {
-	default:
-	case PASTE_TARGET_TYPE_TEXT_PLAIN:
-	{
-		/* FIXME: this'll be fucking slow for the user... pthread this? */
-		CamelFolder *source;
-		CamelStream *stream;
-		GByteArray *bytes;
-		GPtrArray *uids;
-		int i;
-		
-		bytes = fb->clipboard_selection;
-		
-		/* Note: source should == fb->folder, but we might as well use `source' instead of fb->folder */
-		source = mail_tools_x_evolution_message_parse (bytes->data, bytes->len, &uids);
-		if (source == NULL)
-			return;
-		
-		if (uids == NULL) {
-			camel_object_unref (CAMEL_OBJECT (source));
-			return;
-		}
-		
-		bytes = g_byte_array_new ();
-		stream = camel_stream_mem_new ();
-		camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), bytes);
-		
-		for (i = 0; i < uids->len; i++) {
-			CamelMimeMessage *message;
-			
-			message = camel_folder_get_message (source, uids->pdata[i], NULL);
-			g_free (uids->pdata[i]);
-			
-			if (message) {			
-				camel_stream_write (stream, "From - \n", 8);
-				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);
-				camel_object_unref (CAMEL_OBJECT (message));
-			}
-		}
-		
-		g_ptr_array_free (uids, TRUE);
-		camel_object_unref (CAMEL_OBJECT (stream));
-		camel_object_unref (CAMEL_OBJECT (source));
-		
-		gtk_selection_data_set (selection_data, selection_data->target, 8,
-					bytes->data, bytes->len);
-		
-		g_byte_array_free (bytes, FALSE);
-	}
-	break;
-	case PASTE_TARGET_TYPE_X_EVOLUTION_MESSAGE:
-		/* we already have our data in the correct form */
-		gtk_selection_data_set (selection_data,
-					selection_data->target, 8,
-					fb->clipboard_selection->data,
-					fb->clipboard_selection->len);
-		break;
-	}
-}
-
-static void
-selection_clear_event (GtkWidget *widget, GdkEventSelection *event, FolderBrowser *fb)
-{
-	if (fb->clipboard_selection != NULL) {
-		g_byte_array_free (fb->clipboard_selection, TRUE);
-		fb->clipboard_selection = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *widget, GtkSelectionData *selection_data,
-		    guint time, FolderBrowser *fb)
-{
-	CamelFolder *source = NULL;
-	GPtrArray *uids = NULL;
-	
-	if (selection_data == NULL || selection_data->length == -1)
-		return;
-	
-	source = mail_tools_x_evolution_message_parse (selection_data->data, selection_data->length, &uids);
-	if (source == NULL)
-		return;
-	
-	if (uids == NULL) {
-		camel_object_unref (CAMEL_OBJECT (source));
-		return;
-	}
-	
-	mail_transfer_messages (source, uids, FALSE, fb->uri, 0, NULL, NULL);
-	
-	camel_object_unref (CAMEL_OBJECT (source));
-}
-
-void
-folder_browser_copy (GtkWidget *menuitem, FolderBrowser *fb)
-{
-	GPtrArray *uids = NULL;
-	GByteArray *bytes;
-	gboolean cut;
-	int i;
-	
-	if (fb->message_list == NULL)
-		return;
-	
-	cut = menuitem == NULL;
-	
-	if (GTK_WIDGET_HAS_FOCUS (fb->mail_display->html)) {
-		gtk_html_copy (fb->mail_display->html);
-		return;
-	}
-	
-	if (fb->clipboard_selection) {
-		g_byte_array_free (fb->clipboard_selection, TRUE);
-		fb->clipboard_selection = NULL;
-	}
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, add_uid, uids);
-	
-	/* format: "uri uid1\0uid2\0uid3\0...\0uidn" */
-	
-	/* write the uri portion */
-	bytes = g_byte_array_new ();
-	g_byte_array_append (bytes, fb->uri, strlen (fb->uri));
-	g_byte_array_append (bytes, " ", 1);
-	
-	/* write the uids */
-	camel_folder_freeze (fb->folder);
-	for (i = 0; i < uids->len; i++) {
-		if (cut) {
-			camel_folder_set_message_flags (fb->folder, uids->pdata[i],
-							CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED,
-							CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED);
-		}
-		g_byte_array_append (bytes, uids->pdata[i], strlen (uids->pdata[i]));
-		g_free (uids->pdata[i]);
-		
-		if (i + 1 < uids->len)
-			g_byte_array_append (bytes, "", 1);
-	}
-	camel_folder_thaw (fb->folder);
-	
-	g_ptr_array_free (uids, TRUE);
-	
-	fb->clipboard_selection = bytes;
-	
-	gtk_selection_owner_set (fb->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-folder_browser_cut (GtkWidget *menuitem, FolderBrowser *fb)
-{
-	folder_browser_copy (NULL, fb);
-}
-
-void
-folder_browser_paste (GtkWidget *menuitem, FolderBrowser *fb)
-{
-	gtk_selection_convert (fb->invisible, clipboard_atom,
-			       paste_types[0].target,
-			       GDK_CURRENT_TIME);
-}
-
-/* all this crap so we can give the user a whoopee doo status bar */
-static void
-update_status_bar(FolderBrowser *fb)
-{
-	CORBA_Environment ev;
-	int tmp, total;
-	GString *work;
-	extern CamelFolder *outbox_folder, *sent_folder;
-
-	if (fb->folder == NULL
-	    || fb->message_list == NULL
-	    || fb->shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	if (!fb->message_list->hidedeleted || !camel_folder_has_summary_capability(fb->folder)) {
-		total = camel_folder_get_message_count(fb->folder);
-	} else {
-		GPtrArray *sum = camel_folder_get_summary(fb->folder);
-		int i;
-
-		if (sum) {
-			total = 0;
-			for (i=0;i<sum->len;i++) {
-				CamelMessageInfo *info = sum->pdata[i];
-				
-				if ((info->flags & CAMEL_MESSAGE_DELETED) == 0)
-					total++;
-			}
-			camel_folder_free_summary(fb->folder, sum);
-		} else {
-			total = camel_folder_get_message_count(fb->folder);
-		}
-	}
-	
-	work = g_string_new("");
-	g_string_sprintfa(work, _("%d new"), camel_folder_get_unread_message_count(fb->folder));
-	tmp = message_list_hidden(fb->message_list);
-	if (0 < tmp && tmp < total) {
-		g_string_append(work, _(", "));
-		if (tmp < total / 2)
-			g_string_sprintfa(work, _("%d hidden"), tmp);
-		else  
-			g_string_sprintfa(work, _("%d visible"), total - tmp);
-	}
-	tmp = e_selection_model_selected_count(e_tree_get_selection_model(fb->message_list->tree));
-	if (tmp) {
-		g_string_append(work, _(", "));
-		g_string_sprintfa(work, _("%d selected"), tmp);
-	}
-	g_string_append(work, _(", "));
-
-	if (fb->folder == outbox_folder)
-		g_string_sprintfa(work, _("%d unsent"), total);
-	else if (fb->folder == sent_folder)
-		g_string_sprintfa(work, _("%d sent"), total);
-	else
-		g_string_sprintfa(work, _("%d total"), total);
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_ShellView_setFolderBarLabel(fb->shell_view, work->str, &ev);
-	CORBA_exception_free(&ev);
-
-	if (fb->update_status_bar_idle_id != 0) {
-		g_source_remove (fb->update_status_bar_idle_id);
-		fb->update_status_bar_idle_id = 0;
-	}
-
-	g_string_free(work, TRUE);
-}
-
-static gboolean
-update_status_bar_idle_cb(gpointer data)
-{
-	FolderBrowser *fb = data;
-	if (!GTK_OBJECT_DESTROYED (fb))
-		update_status_bar (fb);
-	fb->update_status_bar_idle_id = 0;
-	gtk_object_unref (GTK_OBJECT (fb));
-	return FALSE;
-}
-
-static void
-update_status_bar_idle(FolderBrowser *fb)
-{
-	if (fb->update_status_bar_idle_id == 0) {
-		gtk_object_ref (GTK_OBJECT (fb));
-		fb->update_status_bar_idle_id = g_idle_add (update_status_bar_idle_cb, fb);
-	}
-}
-
-static void main_folder_changed(CamelObject *o, void *event_data, void *data)
-{
-	FolderBrowser *fb = data;
-
-	/* so some corba unref doesnt blow us away while we're busy */
-	gtk_object_ref((GtkObject *)fb);
-	update_status_bar(fb);
-	gtk_object_unref((GtkObject *)fb);
-}
-
-static void folder_changed(CamelObject *o, void *event_data, void *data)
-{
-	FolderBrowser *fb = data;
-
-	mail_async_event_emit(fb->async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)main_folder_changed, o, NULL, data);
-}
-
-static void
-got_folder(char *uri, CamelFolder *folder, void *data)
-{
-	FolderBrowser *fb = data;	
-
-	fb->get_id = -1;
-
-	d(printf ("got folder '%s' = %p, previous folder was %p\n", uri, folder, fb->folder));
-	
-	if (fb->message_list == NULL)
-		goto done;
-	
-	fb->folder = folder;
-	if (folder == NULL)
-		goto done;
-	
-	camel_object_ref (CAMEL_OBJECT (folder));
-	
-	gtk_widget_set_sensitive (GTK_WIDGET (fb->search), camel_folder_has_search_capability (folder));
-	message_list_set_folder (fb->message_list, folder,
-				 folder_browser_is_drafts (fb) ||
-				 folder_browser_is_sent (fb) ||
-				 folder_browser_is_outbox (fb));
-
-	camel_object_hook_event(CAMEL_OBJECT(fb->folder), "folder_changed",
-				folder_changed, fb);
-	camel_object_hook_event(CAMEL_OBJECT(fb->folder), "message_changed",
-				folder_changed, fb);
-
-	if (fb->view_instance != NULL && fb->view_menus != NULL)
-		folder_browser_ui_discard_view_menus (fb);
-
-	folder_browser_ui_setup_view_menus (fb);
-
-	/* when loading a new folder, nothing is selected initially */
-
-	if (fb->uicomp)
-		folder_browser_ui_set_selection_state (fb, FB_SELSTATE_NONE);
-
- done:	
-	gtk_signal_emit (GTK_OBJECT (fb), folder_browser_signals [FOLDER_LOADED], fb->uri);
-	gtk_object_unref (GTK_OBJECT (fb));
-}
-
-void
-folder_browser_set_folder (FolderBrowser *fb, CamelFolder *folder, const char *uri)
-{
-	g_return_if_fail (IS_FOLDER_BROWSER (fb));
-	g_return_if_fail (CAMEL_IS_FOLDER (folder));
-	
-	if (fb->get_id != -1) {
-		/* FIXME: cancel the get_folder request? */
-	}
-	
-	g_free (fb->uri);
-	fb->uri = g_strdup (uri);
-	
-	gtk_object_ref (GTK_OBJECT (fb));
-	got_folder (NULL, folder, fb);
-}
-
-void
-folder_browser_set_ui_component (FolderBrowser *fb, BonoboUIComponent *uicomp)
-{
-	g_return_if_fail (IS_FOLDER_BROWSER (fb));
-
-	if (fb->sensitize_timeout_id) {
-		g_source_remove (fb->sensitize_timeout_id);
-		fb->sensitize_timeout_id = 0;
-	}
-
-	if (fb->sensitise_state) {
-		g_hash_table_destroy(fb->sensitise_state);
-		fb->sensitise_state = NULL;
-	}
-	
-	if (fb->uicomp)
-		bonobo_object_unref (BONOBO_OBJECT (fb->uicomp));
-
-	if (uicomp)
-		bonobo_object_ref (BONOBO_OBJECT (uicomp));
-
-	fb->uicomp = uicomp;
-}
-
-void
-folder_browser_set_shell_view(FolderBrowser *fb, GNOME_Evolution_ShellView shell_view)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-	if (fb->shell_view != CORBA_OBJECT_NIL)
-		CORBA_Object_release(fb->shell_view, &ev);
-	CORBA_exception_free(&ev);
-	
-	fb->shell_view = CORBA_Object_duplicate(shell_view, &ev);
-	CORBA_exception_free(&ev);
-
-	/* small hack, at this point we've just been activated */
-	if (fb->shell_view != CORBA_OBJECT_NIL)
-		update_status_bar(fb);
-}
-
-extern CamelFolder *drafts_folder, *sent_folder, *outbox_folder;
-
-/**
- * folder_browser_is_drafts:
- * @fb: a FolderBrowser
- *
- * Return value: %TRUE if @fb refers to /local/Drafts or any other
- * configured Drafts folder.
- **/
-gboolean
-folder_browser_is_drafts (FolderBrowser *fb)
-{
-	const GSList *accounts;
-	MailConfigAccount *account;
-	
-	g_return_val_if_fail (IS_FOLDER_BROWSER (fb), FALSE);
-
-	if (fb->uri == NULL || fb->folder == NULL)
-		return FALSE;
-	
-	if (fb->folder == drafts_folder)
-		return TRUE;
-
-	accounts = mail_config_get_accounts ();
-	while (accounts) {
-		account = accounts->data;
-		if (account->drafts_folder_uri && camel_store_uri_cmp(fb->folder->parent_store, account->drafts_folder_uri, fb->uri))
-			return TRUE;
-		accounts = accounts->next;
-	}
-	
-	return FALSE;
-}
-
-/**
- * folder_browser_is_sent:
- * @fb: a FolderBrowser
- *
- * Return value: %TRUE if @fb refers to /local/Sent or any other
- * configured Sent folder.
- **/
-gboolean
-folder_browser_is_sent (FolderBrowser *fb)
-{
-	const GSList *accounts;
-	MailConfigAccount *account;
-	
-	g_return_val_if_fail (IS_FOLDER_BROWSER (fb), FALSE);
-
-	if (fb->uri == NULL || fb->folder == NULL)
-		return FALSE;
-
-	if (fb->folder == sent_folder)
-		return TRUE;
-	
-	accounts = mail_config_get_accounts ();
-	while (accounts) {
-		account = accounts->data;
-		if (account->sent_folder_uri && camel_store_uri_cmp(fb->folder->parent_store, account->sent_folder_uri, fb->uri))
-			return TRUE;
-		accounts = accounts->next;
-	}
-	
-	return FALSE;
-}
-
-/**
- * folder_browser_is_outbox:
- * @fb: a FolderBrowser
- *
- * Return value: %TRUE if @fb refers to /local/Outbox or any other
- * configured Outbox folder.
- **/
-gboolean
-folder_browser_is_outbox (FolderBrowser *fb)
-{
-	/* There can be only one. */
-	return fb->folder == outbox_folder;
-}
-
-static int
-save_cursor_pos (FolderBrowser *fb)
-{
-	ETreePath node;
-	GtkAdjustment *adj;
-	int row, y, height;
-
-	node = e_tree_get_cursor (fb->message_list->tree);
-	if (!node)
-		return -1;
-
-	row = e_tree_row_of_node (fb->message_list->tree, node);
-
-	if (row == -1)
-		return 0;
-
-	e_tree_get_cell_geometry (fb->message_list->tree, row, 0,
-				  NULL, &y, NULL, &height);
-
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (fb->message_list));
-	y += adj->value - ((mail_config_get_paned_size () - height) / 2);
-	
-	return y;
-}
-
-static void
-set_cursor_pos (FolderBrowser *fb, int y)
-{
-	GtkAdjustment *adj;
-
-	if (y == -1)
-		return;
-
-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (fb->message_list));
-	gtk_adjustment_set_value (adj, (gfloat)y);
-}
-
-static gboolean do_message_selected(FolderBrowser *fb);
-
-void
-folder_browser_set_message_preview (FolderBrowser *folder_browser, gboolean show_message_preview)
-{
-	if (folder_browser->preview_shown == show_message_preview
-	    || folder_browser->message_list == NULL)
-		return;
-
-	folder_browser->preview_shown = show_message_preview;
-
-	if (show_message_preview) {
-		int y;
-		y = save_cursor_pos (folder_browser);
-		e_paned_set_position (E_PANED (folder_browser->vpaned), mail_config_get_paned_size ());
-		gtk_widget_show (GTK_WIDGET (folder_browser->mail_display));
-		do_message_selected (folder_browser);
-		set_cursor_pos (folder_browser, y);
-	} else {
-		e_paned_set_position (E_PANED (folder_browser->vpaned), 10000);
-		gtk_widget_hide (GTK_WIDGET (folder_browser->mail_display));
-		mail_display_set_message (folder_browser->mail_display, NULL, NULL);
-		folder_browser_ui_message_loaded(folder_browser);
-	}
-}
-
-enum {
-	ESB_SAVE,
-};
-
-static ESearchBarItem folder_browser_search_menu_items[] = {
-	E_FILTERBAR_ADVANCED,
-	{ NULL, 0, NULL },
-	E_FILTERBAR_SAVE,
-	E_FILTERBAR_EDIT,
-	{ NULL, 0, NULL },
-	{ N_("Create _Virtual Folder From Search..."), ESB_SAVE, NULL  },
-	{ NULL, -1, NULL }
-};
-
-static void
-folder_browser_search_menu_activated (ESearchBar *esb, int id, FolderBrowser *fb)
-{
-	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 = vfolder_clone_rule(efb->current_query);			
-			
-			filter_rule_set_source(rule, FILTER_SOURCE_INCOMING);
-			vfolder_rule_add_source((VfolderRule *)rule, fb->uri);
-			vfolder_gui_add_rule((VfolderRule *)rule);
-		}
-		break;
-	}
-}
-
-static void
-folder_browser_config_search (EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (data);
-	ESearchingTokenizer *st;
-	GList *partl;
-
-	st = E_SEARCHING_TOKENIZER (fb->mail_display->html->engine->ht); 
-
-	e_searching_tokenizer_set_secondary_search_string (st, NULL);
-	
-	/* we scan the parts of a rule, and set all the types we know about to the query string */
-	partl = rule->parts;
-	while (partl) {
-		FilterPart *part = partl->data;
-
-		if (!strcmp(part->name, "subject")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "subject");
-			if (input)
-				filter_input_set_value(input, query);
-		} else if (!strcmp(part->name, "body")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "word");
-			if (input)
-				filter_input_set_value(input, query);
-			e_searching_tokenizer_set_secondary_search_string (st, query);
-		} else if(!strcmp(part->name, "sender")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "sender");
-			if (input)
-				filter_input_set_value(input, query);
-		} else if(!strcmp(part->name, "to")) {
-			FilterInput *input = (FilterInput *)filter_part_find_element(part, "recipient");
-			if (input)
-				filter_input_set_value(input, query);
-		}
-		
-		partl = partl->next;
-	}
-	
-	d(printf("configuring search for search string '%s', rule is '%s'\n", query, rule->name));
-	
-	mail_display_redisplay (fb->mail_display, FALSE);
-}
-
-static void
-folder_browser_search_do_search (ESearchBar *esb, FolderBrowser *fb)
-{
-	char *search_word;
-
-	if (fb->message_list == NULL)
-		return;
-	
-	d(printf("query changed\n"));
-	
-	gtk_object_get (GTK_OBJECT (esb),
-			"query", &search_word,
-			NULL);
-
-	message_list_set_search (fb->message_list, search_word);
-	
-	d(printf("query is %s\n", search_word));
-	g_free(search_word);
-	return;
-}
-
-void
-folder_browser_toggle_preview (BonoboUIComponent           *component,
-			       const char                  *path,
-			       Bonobo_UIComponent_EventType type,
-			       const char                  *state,
-			       gpointer                     user_data)
-{
-	FolderBrowser *fb = user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED
-	    || fb->message_list == NULL)
-		return;
-	
-	mail_config_set_show_preview (fb->uri, atoi (state));
-	folder_browser_set_message_preview (fb, atoi (state));
-}
-
-void
-folder_browser_toggle_threads (BonoboUIComponent           *component,
-			       const char                  *path,
-			       Bonobo_UIComponent_EventType type,
-			       const char                  *state,
-			       gpointer                     user_data)
-{
-	FolderBrowser *fb = user_data;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED
-	    || fb->message_list == NULL)
-		return;
-	
-	mail_config_set_thread_list (fb->uri, atoi (state));
-	message_list_set_threaded (fb->message_list, atoi (state));
-}
-
-void
-folder_browser_toggle_hide_deleted (BonoboUIComponent           *component,
-				    const char                  *path,
-				    Bonobo_UIComponent_EventType type,
-				    const char                  *state,
-				    gpointer                     user_data)
-{
-	FolderBrowser *fb = user_data;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED
-	    || fb->message_list == NULL)
-		return;
-
-	if (!(fb->folder && (fb->folder->folder_flags & CAMEL_FOLDER_IS_TRASH)))
-		mail_config_set_hide_deleted (atoi (state));
-	message_list_set_hidedeleted (fb->message_list, atoi (state));
-}
-
-void
-folder_browser_set_message_display_style (BonoboUIComponent           *component,
-					  const char                  *path,
-					  Bonobo_UIComponent_EventType type,
-					  const char                  *state,
-					  gpointer                     user_data)
-{
-	extern char *message_display_styles[];
-	FolderBrowser *fb = user_data;
-	int i;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED
-	    || atoi(state) == 0
-	    || fb->message_list == NULL)
-		return;
-
-	for (i = 0; i < MAIL_CONFIG_DISPLAY_MAX; i++) {
-		if (strstr (message_display_styles[i], path)) {
-			fb->mail_display->display_style = i;
-			mail_display_redisplay (fb->mail_display, TRUE);
-
-			if (fb->pref_master)
-				mail_config_set_message_display_style (i);
-			return;
-		}
-	}
-}
-
-void
-folder_browser_charset_changed (BonoboUIComponent           *component,
-				const char                  *path,
-				Bonobo_UIComponent_EventType type,
-				const char                  *state,
-				gpointer                     user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	const char *charset;
-	
-	if (type != Bonobo_UIComponent_STATE_CHANGED
-	    || fb->message_list == NULL)
-		return;
-	
-	if (atoi (state)) {
-		/* Charset menu names are "Charset-%s" where %s is the charset name */
-		charset = path + strlen ("Charset-");
-		if (!strcmp (charset, FB_DEFAULT_CHARSET))
-			charset = NULL;
-		
-		mail_display_set_charset (fb->mail_display, charset);
-	}
-}
-
-/* external api to vfolder/filter on X, based on current message */
-void
-vfolder_subject (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_SUBJECT, fb->uri);
-}
-
-void
-vfolder_sender (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_FROM, fb->uri);
-}
-
-void
-vfolder_recipient (GtkWidget *w, FolderBrowser *fb)
-{
-	vfolder_gui_add_from_message (fb->mail_display->current_message, AUTO_TO, fb->uri);
-}
-
-void
-vfolder_mlist (GtkWidget *w, FolderBrowser *fb)
-{
-	char *name;
-
-	g_return_if_fail (fb->mail_display->current_message != NULL);
-
-	name = header_raw_check_mailing_list(&((CamelMimePart *)fb->mail_display->current_message)->headers);
-	if (name) {
-		g_strstrip (name);
-		vfolder_gui_add_from_mlist(name, fb->uri);
-		g_free(name);
-	}
-}
-
-void
-filter_subject (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_SUBJECT);
-}
-
-void
-filter_sender (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_FROM);
-}
-
-void
-filter_recipient (GtkWidget *w, FolderBrowser *fb)
-{
-	filter_gui_add_from_message (fb->mail_display->current_message, AUTO_TO);
-}
-
-void
-filter_mlist (GtkWidget *w, FolderBrowser *fb)
-{
-	char *name;
-
-	g_return_if_fail (fb->mail_display->current_message != NULL);
-
-	name = header_raw_check_mailing_list(&((CamelMimePart *)fb->mail_display->current_message)->headers);
-	if (name) {
-		filter_gui_add_from_mlist(name);
-		g_free(name);
-	}
-}
-
-/* ************************************************************ */
-
-/* popup api to vfolder/filter on X, based on current selection */
-struct _filter_data {
-	CamelFolder *folder;
-	char *uid;
-	int type;
-	char *uri;
-	char *mlist;
-};
-
-static void
-filter_data_free(struct _filter_data *fdata)
-{
-	g_free(fdata->uid);
-	g_free(fdata->uri);
-	if (fdata->folder)
-		camel_object_unref((CamelObject *)fdata->folder);
-	g_free(fdata->mlist);
-	g_free(fdata);
-}
-
-static void
-vfolder_type_got_message(CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *d)
-{
-	struct _filter_data *data = d;
-
-	if (msg)
-		vfolder_gui_add_from_message(msg, data->type, data->uri);
-
-	filter_data_free(data);
-}
-
-static void
-vfolder_type_uid(struct _filter_data *fdata, int type)
-{
-	struct _filter_data *data;
-
-	/* sigh, we need to copy this because the menu will free the one we got passed in */
-	data = g_malloc0(sizeof(*data));
-	data->type = type;
-	data->uri = fdata->uri;
-	fdata->uri = NULL;
-	mail_get_message(fdata->folder, fdata->uid, vfolder_type_got_message, data, mail_thread_new);
-}
-
-static void vfolder_subject_uid (GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata, AUTO_SUBJECT); }
-static void vfolder_sender_uid(GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata, AUTO_FROM); }
-static void vfolder_recipient_uid(GtkWidget *w, struct _filter_data *fdata)	{ vfolder_type_uid(fdata, AUTO_TO); }
-static void vfolder_mlist_uid(GtkWidget *w, struct _filter_data *fdata)		{ vfolder_gui_add_from_mlist(fdata->mlist, fdata->uri); }
-
-static void
-filter_type_got_message(CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *d)
-{
-	struct _filter_data *data = d;
-
-	if (msg)
-		filter_gui_add_from_message(msg, data->type);
-
-	filter_data_free(data);
-}
-
-static void
-filter_type_uid(struct _filter_data *fdata, int type)
-{
-	struct _filter_data *data;
-
-	/* sigh, we need to copy this because the menu will free the one we got passed in */
-	data = g_malloc0(sizeof(*data));
-	data->type = type;
-	mail_get_message(fdata->folder, fdata->uid, filter_type_got_message, data, mail_thread_new);
-}
-
-static void filter_subject_uid (GtkWidget *w, struct _filter_data *fdata)	{ filter_type_uid(fdata, AUTO_SUBJECT); }
-static void filter_sender_uid(GtkWidget *w, struct _filter_data *fdata)		{ filter_type_uid(fdata, AUTO_FROM); }
-static void filter_recipient_uid(GtkWidget *w, struct _filter_data *fdata)	{ filter_type_uid(fdata, AUTO_TO); }
-static void filter_mlist_uid(GtkWidget *w, struct _filter_data *fdata)		{ filter_gui_add_from_mlist(fdata->mlist); }
-
-void
-hide_none(GtkWidget *w, FolderBrowser *fb)
-{
-	message_list_hide_clear(fb->message_list);
-}
-
-void
-hide_selected(GtkWidget *w, FolderBrowser *fb)
-{
-	GPtrArray *uids;
-	int i;
-
-	uids = g_ptr_array_new();
-	message_list_foreach(fb->message_list, enumerate_msg, uids);
-	message_list_hide_uids(fb->message_list, uids);
-	for (i=0; i<uids->len; i++)
-		g_free(uids->pdata[i]);
-	g_ptr_array_free(uids, TRUE);
-}
-
-void
-hide_deleted(GtkWidget *w, FolderBrowser *fb)
-{
-	MessageList *ml = fb->message_list;
-
-	message_list_hide_add(ml, "(match-all (system-flag \"deleted\"))", ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-void
-hide_read(GtkWidget *w, FolderBrowser *fb)
-{
-	MessageList *ml = fb->message_list;
-
-	message_list_hide_add(ml, "(match-all (system-flag \"seen\"))", ML_HIDE_SAME, ML_HIDE_SAME);
-}
-
-/* dum de dum, about the 3rd copy of this function throughout the mailer/camel */
-static const char *
-strip_re(const char *subject)
-{
-	const unsigned char *s, *p;
-	
-	s = (unsigned char *) subject;
-	
-	while (*s) {
-		while(isspace (*s))
-			s++;
-		if (s[0] == 0)
-			break;
-		if ((s[0] == 'r' || s[0] == 'R')
-		    && (s[1] == 'e' || s[1] == 'E')) {
-			p = s+2;
-			while (isdigit(*p) || (ispunct(*p) && (*p != ':')))
-				p++;
-			if (*p == ':') {
-				s = p + 1;
-			} else
-				break;
-		} else
-			break;
-	}
-	return (char *) s;
-}
-
-void
-hide_subject(GtkWidget *w, FolderBrowser *fb)
-{
-	const char *subject;
-	GString *expr;
-
-	if (fb->mail_display->current_message) {
-		subject = camel_mime_message_get_subject(fb->mail_display->current_message);
-		if (subject) {
-			subject = strip_re(subject);
-			if (subject && subject[0]) {
-				expr = g_string_new("(match-all (header-contains \"subject\" ");
-				e_sexp_encode_string(expr, subject);
-				g_string_append(expr, "))");
-				message_list_hide_add(fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
-				g_string_free(expr, TRUE);
-				return;
-			}
-		}
-	}
-}
-
-void
-hide_sender(GtkWidget *w, FolderBrowser *fb)
-{
-	const CamelInternetAddress *from;
-	const char *real, *addr;
-	GString *expr;
-
-	if (fb->mail_display->current_message) {
-		from = camel_mime_message_get_from(fb->mail_display->current_message);
-		if (camel_internet_address_get(from, 0, &real, &addr)) {
-			expr = g_string_new("(match-all (header-contains \"from\" ");
-			e_sexp_encode_string(expr, addr);
-			g_string_append(expr, "))");
-			message_list_hide_add(fb->message_list, expr->str, ML_HIDE_SAME, ML_HIDE_SAME);
-			g_string_free(expr, TRUE);
-			return;
-		}
-	}
-}
-
-struct _colour_data {
-	FolderBrowser *fb;
-	guint32 rgb;
-};
-
-#define COLOUR_NONE (~0)
-
-static void
-colourise_msg (GtkWidget *widget, gpointer user_data)
-{
-	struct _colour_data *data = user_data;
-	char *colour = NULL;
-	GPtrArray *uids;
-	int i;
-	
-	if (data->rgb != COLOUR_NONE) {
-		colour = alloca (8);
-		sprintf (colour, "#%.2x%.2x%.2x", (data->rgb & 0xff0000) >> 16,
-			 (data->rgb & 0xff00) >> 8, data->rgb & 0xff);
-	}
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (data->fb->message_list, enumerate_msg, uids);
-	for (i = 0; i < uids->len; i++) {
-		camel_folder_set_message_user_tag (data->fb->folder, uids->pdata[i], "colour", colour);
-	}
-	g_ptr_array_free (uids, TRUE);
-}
-
-
-enum {
-	SELECTION_SET              = 1<<1,
-	CAN_MARK_READ              = 1<<2,
-	CAN_MARK_UNREAD            = 1<<3,
-	CAN_DELETE                 = 1<<4,
-	CAN_UNDELETE               = 1<<5,
-	IS_MAILING_LIST            = 1<<6,
-	CAN_RESEND                 = 1<<7,
-	CAN_MARK_IMPORTANT         = 1<<8,
-	CAN_MARK_UNIMPORTANT       = 1<<9,
-	CAN_FLAG_FOR_FOLLOWUP      = 1<<10,
-	CAN_FLAG_COMPLETED         = 1<<11,
-	CAN_CLEAR_FLAG             = 1<<12,
-	CAN_ADD_SENDER             = 1<<13
-};
-
-#define MLIST_VFOLDER (3)
-#define MLIST_FILTER (8)
-
-static EPopupMenu filter_menu[] = {
-	E_POPUP_ITEM_CC (N_("VFolder on _Subject"),        GTK_SIGNAL_FUNC (vfolder_subject_uid),   NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("VFolder on Se_nder"),         GTK_SIGNAL_FUNC (vfolder_sender_uid),    NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("VFolder on _Recipients"),     GTK_SIGNAL_FUNC (vfolder_recipient_uid), NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("VFolder on Mailing _List"),   GTK_SIGNAL_FUNC (vfolder_mlist_uid),     NULL, SELECTION_SET | IS_MAILING_LIST),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM_CC (N_("Filter on Sub_ject"),         GTK_SIGNAL_FUNC (filter_subject_uid),    NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("Filter on Sen_der"),          GTK_SIGNAL_FUNC (filter_sender_uid),     NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("Filter on Re_cipients"),      GTK_SIGNAL_FUNC (filter_recipient_uid),  NULL, SELECTION_SET),
-	E_POPUP_ITEM_CC (N_("Filter on _Mailing List"),    GTK_SIGNAL_FUNC (filter_mlist_uid),      NULL, SELECTION_SET | IS_MAILING_LIST),
-	
-	E_POPUP_TERMINATOR
-};
-
-static EPopupMenu label_menu[] = {
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (N_("None"), NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_SEPARATOR,
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_PIXMAP_WIDGET_ITEM_CC (NULL, NULL, GTK_SIGNAL_FUNC (colourise_msg), NULL, 0),
-	E_POPUP_TERMINATOR
-};
-
-static EPopupMenu context_menu[] = {
-	E_POPUP_ITEM (N_("_Open"),                    GTK_SIGNAL_FUNC (open_msg),          0),
-	E_POPUP_ITEM (N_("_Edit as New Message..."),  GTK_SIGNAL_FUNC (resend_msg),        CAN_RESEND),
-	E_POPUP_ITEM (N_("_Save As..."),              GTK_SIGNAL_FUNC (save_msg),          0),
-	E_POPUP_ITEM (N_("_Print"),                   GTK_SIGNAL_FUNC (print_msg),         0),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("_Reply to Sender"),         GTK_SIGNAL_FUNC (reply_to_sender),   0),
-	E_POPUP_ITEM (N_("Reply to _List"),           GTK_SIGNAL_FUNC (reply_to_list),     0),
-	E_POPUP_ITEM (N_("Reply to _All"),            GTK_SIGNAL_FUNC (reply_to_all),      0),
-	E_POPUP_ITEM (N_("_Forward"),                 GTK_SIGNAL_FUNC (forward),           0),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("Follo_w Up..."),            GTK_SIGNAL_FUNC (flag_for_followup),       CAN_FLAG_FOR_FOLLOWUP),
-	E_POPUP_ITEM (N_("Fla_g Completed"),          GTK_SIGNAL_FUNC (flag_followup_completed), CAN_FLAG_COMPLETED),
-	E_POPUP_ITEM (N_("Cl_ear Flag"),              GTK_SIGNAL_FUNC (flag_followup_clear),     CAN_CLEAR_FLAG),
-	
-	/* separator here? */
-	
-	E_POPUP_ITEM (N_("Mar_k as Read"),            GTK_SIGNAL_FUNC (mark_as_seen),        CAN_MARK_READ),
-	E_POPUP_ITEM (N_("Mark as _Unread"),          GTK_SIGNAL_FUNC (mark_as_unseen),      CAN_MARK_UNREAD),
-	E_POPUP_ITEM (N_("Mark as _Important"),       GTK_SIGNAL_FUNC (mark_as_important),   CAN_MARK_IMPORTANT),
-	E_POPUP_ITEM (N_("_Mark as Unimportant"),     GTK_SIGNAL_FUNC (mark_as_unimportant), CAN_MARK_UNIMPORTANT),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("_Delete"),                  GTK_SIGNAL_FUNC (delete_msg),          CAN_DELETE),
-	E_POPUP_ITEM (N_("U_ndelete"),                GTK_SIGNAL_FUNC (undelete_msg),        CAN_UNDELETE),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("Mo_ve to Folder..."),       GTK_SIGNAL_FUNC (move_msg_cb),          0),
-	E_POPUP_ITEM (N_("_Copy to Folder..."),       GTK_SIGNAL_FUNC (copy_msg_cb),          0),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_SUBMENU (N_("Label"),                 label_menu,                             0),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("Add Sender to Address_book"), GTK_SIGNAL_FUNC (addrbook_sender), SELECTION_SET | CAN_ADD_SENDER),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_ITEM (N_("Appl_y Filters"),             GTK_SIGNAL_FUNC (apply_filters),      0),
-	
-	E_POPUP_SEPARATOR,
-	
-	E_POPUP_SUBMENU (N_("Crea_te Rule From Message"), filter_menu,                        SELECTION_SET),
-	
-	E_POPUP_TERMINATOR
-};
-
-/* Note: this must be kept in sync with the context_menu!!! */
-static char *context_pixmaps[] = {
-	NULL, /* Open */
-	NULL, /* Edit */
-	"save-as-16.png",
-	"print.xpm",
-	NULL,
-	"reply.xpm",
-	NULL, /* Reply to List */
-	"reply_to_all.xpm",
-	"forward.xpm",
-	NULL,
-	"flag-for-followup-16.png",
-	NULL, /* Flag */
-	NULL, /* Clear */
-	"mail-read.xpm",
-	"mail-new.xpm",
-	"priority-high.xpm",
-	NULL, /* Mark as Unimportant */
-	NULL,
-	"evolution-trash-mini.png",
-	"undelete_message-16.png",
-	NULL,
-	"move_message.xpm",
-	"copy_16_message.xpm",
-	NULL,
-	NULL, /* Label */
-	NULL,
-	NULL, /* Add Sender to Addressbook */
-	NULL,
-	NULL, /* Apply Filters */
-	NULL,
-	NULL, /* Create Rule from Message */
-};
-
-struct cmpf_data {
-	ETree *tree;
-	int row, col;
-};
-
-static void
-context_menu_position_func (GtkMenu *menu, gint *x, gint *y,
-			    gpointer user_data)
-{
-	int tx, ty, tw, th;
-	struct cmpf_data *closure = user_data;
-	
-	gdk_window_get_origin (GTK_WIDGET (closure->tree)->window, x, y);
-	e_tree_get_cell_geometry (closure->tree, closure->row, closure->col,
-				  &tx, &ty, &tw, &th);
-	*x += tx + tw / 2;
-	*y += ty + th / 2;
-}
-
-static gboolean
-followup_tag_complete (const char *tag_value)
-{
-	struct _FollowUpTag *tag;
-	gboolean ret;
-	
-	tag = message_tag_followup_decode (tag_value);
-	ret = tag->completed != (time_t) 0 ? TRUE : FALSE;
-	g_free (tag);
-	
-	return ret;
-}
-
-static void
-setup_popup_icons (void)
-{
-	int i;
-	
-	for (i = 0; context_menu[i].name; i++) {
-		if (context_pixmaps[i]) {
-			char *filename;
-			
-			filename = g_strdup_printf ("%s/%s", EVOLUTION_IMAGES, context_pixmaps[i]);
-			context_menu[i].pixmap_widget = gnome_pixmap_new_from_file (filename);
-			g_free (filename);
-		}
-	}
-}
-
-static void
-colour_closures_free (GPtrArray *closures)
-{
-	struct _colour_data *data;
-	int i;
-	
-	for (i = 0; i < closures->len; i++) {
-		data = closures->pdata[i];
-		gtk_object_unref (GTK_OBJECT (data->fb));
-		g_free (data);
-	}
-	g_ptr_array_free (closures, TRUE);
-}
-
-/* handle context menu over message-list */
-static int
-on_right_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, FolderBrowser *fb)
-{
-	CamelMessageInfo *info;
-	GPtrArray *uids, *closures;
-	int enable_mask = 0;
-	int hide_mask = 0;
-	int i;
-	char *mlist = NULL;
-	GtkMenu *menu;
-	struct _filter_data *fdata = NULL;
-	
-	if (!folder_browser_is_sent (fb)) {
-		enable_mask |= CAN_RESEND;
-		hide_mask |= CAN_RESEND;
-	} else {
-		enable_mask |= CAN_ADD_SENDER;
-		hide_mask |= CAN_ADD_SENDER;
-	}
-	
-	if (folder_browser_is_drafts (fb)) {
-		enable_mask |= CAN_ADD_SENDER;
-		hide_mask |= CAN_ADD_SENDER;
-	}
-	
-	if (fb->folder == outbox_folder) {
-		enable_mask |= CAN_ADD_SENDER;
-		hide_mask |= CAN_ADD_SENDER;
-	}
-	
-	enable_mask |= SELECTION_SET;
-	
-	/* get a list of uids */
-	uids = g_ptr_array_new ();
-	message_list_foreach (fb->message_list, enumerate_msg, uids);
-	if (uids->len >= 1) {
-		/* gray-out any items we don't need */
-		gboolean have_deleted = FALSE;
-		gboolean have_undeleted = FALSE;
-		gboolean have_seen = FALSE;
-		gboolean have_unseen = FALSE;
-		gboolean have_important = FALSE;
-		gboolean have_unimportant = FALSE;
-		gboolean have_flag_for_followup = FALSE;
-		gboolean have_flag_completed = FALSE;
-		gboolean have_flag_incomplete = FALSE;
-		gboolean have_unflagged = FALSE;
-		const char *tag;
-		
-		for (i = 0; i < uids->len; i++) {
-			info = camel_folder_get_message_info (fb->folder, uids->pdata[i]);
-			if (info == NULL)
-				continue;
-			
-			if (i == 0 && uids->len == 1) {
-				const char *mname, *p;
-				char c, *o;
-				
-				/* used by filter/vfolder from X callbacks */
-				fdata = g_malloc0(sizeof(*fdata));
-				fdata->uid = g_strdup(uids->pdata[i]);
-				fdata->uri = g_strdup(fb->uri);
-				fdata->folder = fb->folder;
-				camel_object_ref((CamelObject *)fdata->folder);
-				
-				enable_mask &= ~SELECTION_SET;
-				mname = camel_message_info_mlist(info);
-				if (mname && mname[0]) {
-					fdata->mlist = g_strdup(mname);
-					
-					/* Escape the mailing list name before showing it */
-					mlist = alloca (strlen (mname)+2);
-					p = mname;
-					o = mlist;
-					while ((c = *p++)) {
-						if (c == '_')
-							*o++ = '_';
-						*o++ = c;
-					}
-					*o = 0;
-				}
-			}
-			
-			if (info->flags & CAMEL_MESSAGE_SEEN)
-				have_seen = TRUE;
-			else
-				have_unseen = TRUE;
-			
-			if (info->flags & CAMEL_MESSAGE_DELETED)
-				have_deleted = TRUE;
-			else
-				have_undeleted = TRUE;
-			
-			if (info->flags & CAMEL_MESSAGE_FLAGGED)
-				have_important = TRUE;
-			else
-				have_unimportant = TRUE;
-			
-			if ((tag = camel_tag_get (&info->user_tags, "follow-up"))) {
-				have_flag_for_followup = TRUE;
-				if (followup_tag_complete (tag))
-					have_flag_completed = TRUE;
-				else
-					have_flag_incomplete = TRUE;
-			} else
-				have_unflagged = TRUE;
-			
-			camel_folder_free_message_info (fb->folder, info);
-			
-			if (have_seen && have_unseen && have_deleted && have_undeleted)
-				break;
-		}
-		
-		if (!have_unseen)
-			enable_mask |= CAN_MARK_READ;
-		if (!have_seen)
-			enable_mask |= CAN_MARK_UNREAD;
-		
-		if (!have_undeleted)
-			enable_mask |= CAN_DELETE;
-		if (!have_deleted)
-			enable_mask |= CAN_UNDELETE;
-		
-		if (!have_unimportant)
-			enable_mask |= CAN_MARK_IMPORTANT;
-		if (!have_important)
-			enable_mask |= CAN_MARK_UNIMPORTANT;
-		
-		if (!have_flag_for_followup)
-			enable_mask |= CAN_CLEAR_FLAG;
-		if (!have_unflagged)
-			enable_mask |= CAN_FLAG_FOR_FOLLOWUP;
-		if (!have_flag_incomplete)
-			enable_mask |= CAN_FLAG_COMPLETED;
-		
-		/*
-		 * Hide items that wont get used.
-		 */
-		if (!(have_unseen && have_seen)) {
-			if (have_seen)
-				hide_mask |= CAN_MARK_READ;
-			else
-				hide_mask |= CAN_MARK_UNREAD;
-		}
-		
-		if (!(have_undeleted && have_deleted)) {
-			if (have_deleted)
-				hide_mask |= CAN_DELETE;
-			else
-				hide_mask |= CAN_UNDELETE;
-		}
-		
-		if (!(have_important && have_unimportant)) {
-			if (have_important)
-				hide_mask |= CAN_MARK_IMPORTANT;
-			else
-				hide_mask |= CAN_MARK_UNIMPORTANT;
-		}
-		
-		if (!have_flag_for_followup)
-			hide_mask |= CAN_CLEAR_FLAG;
-		if (!have_unflagged)
-			hide_mask |= CAN_FLAG_FOR_FOLLOWUP;
-		if (!have_flag_incomplete)
-			hide_mask |= CAN_FLAG_COMPLETED;
-	}
-	
-	/* free uids */
-	for (i = 0; i < uids->len; i++)
-		g_free (uids->pdata[i]);
-	g_ptr_array_free (uids, TRUE);
-	
-	/* generate the "Filter on Mailing List" menu item name */
-	if (mlist == NULL) {
-		enable_mask |= IS_MAILING_LIST;
-		filter_menu[MLIST_FILTER].name = g_strdup (_("Filter on _Mailing List"));
-		filter_menu[MLIST_VFOLDER].name = g_strdup (_("VFolder on M_ailing List"));
-	} else {
-		filter_menu[MLIST_FILTER].name = g_strdup_printf (_("Filter on _Mailing List (%s)"), mlist);
-		filter_menu[MLIST_VFOLDER].name = g_strdup_printf (_("VFolder on M_ailing List (%s)"), mlist);
-	}
-	
-	/* create the label/colour menu */
-	closures = g_ptr_array_new ();
-	label_menu[0].closure = g_new (struct _colour_data, 1);
-	g_ptr_array_add (closures, label_menu[0].closure);
-	gtk_object_ref (GTK_OBJECT (fb));
-	((struct _colour_data *) label_menu[0].closure)->fb = fb;
-	((struct _colour_data *) label_menu[0].closure)->rgb = COLOUR_NONE;
-	
-	for (i = 0; i < 5; i++) {
-		struct _colour_data *closure;
-		GdkPixmap *pixmap;
-		GdkColormap *map;
-		GdkColor color;
-		guint32 rgb;
-		GdkGC *gc;
-		
-		rgb = mail_config_get_label_color (i);
-		
-		color.red = ((rgb & 0xff0000) >> 8) | 0xff;
-		color.green = (rgb & 0xff00) | 0xff;
-		color.blue = ((rgb & 0xff) << 8) | 0xff;
-		
-		map = gdk_colormap_get_system ();
-		gdk_color_alloc (map, &color);
-		
-		pixmap = gdk_pixmap_new (GTK_WIDGET (fb)->window, 16, 16, -1);
-		gc = gdk_gc_new (GTK_WIDGET (fb)->window);
-		gdk_gc_set_foreground (gc, &color);
-		gdk_draw_rectangle (pixmap, gc, TRUE, 0, 0, 16, 16);
-		gdk_gc_unref (gc);
-		
-		closure = g_new (struct _colour_data, 1);
-		gtk_object_ref (GTK_OBJECT (fb));
-		closure->fb = fb;
-		closure->rgb = rgb;
-		
-		g_ptr_array_add (closures, closure);
-		
-		label_menu[i + 2].name = e_utf8_to_locale_string (mail_config_get_label_name (i));
-		label_menu[i + 2].pixmap_widget = gtk_pixmap_new (pixmap, NULL);
-		label_menu[i + 2].closure = closure;
-	}
-	
-	setup_popup_icons ();
-	
-	for (i = 0; i < sizeof (filter_menu) / sizeof (filter_menu[0]); i++)
-		filter_menu[i].closure = fdata;
-	
-	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, fb);
-	e_auto_kill_popup_menu_on_hide (menu);
-	
-	gtk_object_set_data_full (GTK_OBJECT (menu), "colour_closures",
-				  closures, (GtkDestroyNotify) colour_closures_free);
-	
-	if (fdata)
-		gtk_object_set_data_full (GTK_OBJECT (menu), "filter_data",
-					  fdata, (GtkDestroyNotify) filter_data_free);
-	
-	if (event->type == GDK_KEY_PRESS) {
-		struct cmpf_data closure;
-		
-		closure.tree = tree;
-		closure.row = row;
-		closure.col = col;
-		gtk_menu_popup (menu, NULL, NULL, context_menu_position_func,
-				&closure, 0, event->key.time);
-	} else {
-		gtk_menu_popup (menu, NULL, NULL, NULL, NULL,
-				event->button.button, event->button.time);
-	}
-	
-	g_free (filter_menu[MLIST_FILTER].name);
-	g_free (filter_menu[MLIST_VFOLDER].name);
-	
-	/* free the label/colour menu */
-	for (i = 0; i < 5; i++) {
-		g_free (label_menu[i + 2].name);
-	}
-	
-	return TRUE;
-}
-
-static int
-html_button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-	FolderBrowser *fb = data;
-	HTMLEngine *engine;
-	HTMLPoint *point;
-	ETreePath *path;
-	int row;
-	
-	if (event->type != GDK_BUTTON_PRESS || event->button != 3)
-		return FALSE;
-	
-	engine = GTK_HTML (widget)->engine;
-	point = html_engine_get_point_at (engine, event->x + engine->x_offset,
-					  event->y + engine->y_offset, FALSE);
-	
-	if (point) {
-		/* don't popup a menu if the mouse is hovering over a
-                   url or a source image because those situations are
-                   handled in mail-display.c's button_press_event
-                   callback */
-		const char *src, *url;
-		
-		url = html_object_get_url (point->object);
-		src = html_object_get_src (point->object);
-		
-		if (url || src) {
-			html_point_destroy (point);
-			return FALSE;
-		}
-		
-		html_point_destroy (point);
-	}	
-	
-	path = e_tree_get_cursor (fb->message_list->tree);
-	row = e_tree_row_of_node (fb->message_list->tree, path);
-	
-	on_right_click (fb->message_list->tree, row, path, 2,
-			(GdkEvent *) event, fb);
-	
-	return TRUE;
-}
-
-static int
-on_key_press (GtkWidget *widget, GdkEventKey *key, gpointer data)
-{
-	FolderBrowser *fb = data;
-	ETreePath *path;
-	int row;
-	
-	if (key->state & GDK_CONTROL_MASK)
-		return FALSE;
-	
-	path = e_tree_get_cursor (fb->message_list->tree);
-	row = e_tree_row_of_node (fb->message_list->tree, path);
-	
-	switch (key->keyval) {
-	case GDK_Delete:
-	case GDK_KP_Delete:
-		delete_msg (NULL, fb);
-		return TRUE;
-		
-	case GDK_Menu:
-		on_right_click (fb->message_list->tree, row, path, 2,
-				(GdkEvent *)key, fb);
-		return TRUE;
-	case '!':
-		toggle_as_important (NULL, fb, NULL);
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-static int
-etree_key (ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, FolderBrowser *fb)
-{
-	GtkAdjustment *vadj;
-	gfloat page_size;
-
-	if ((ev->key.state & GDK_CONTROL_MASK) != 0)
-		return FALSE;
-
-	vadj = e_scroll_frame_get_vadjustment (fb->mail_display->scroll);
-	page_size = vadj->page_size - vadj->step_increment;
-
-	switch (ev->key.keyval) {
-	case GDK_space:
-		/* Work around Ximian 4939 */
-		if (vadj->upper < vadj->page_size)
-			break;
-		if (vadj->value < vadj->upper - vadj->page_size - page_size)
-			vadj->value += page_size;
-		else
-			vadj->value = vadj->upper - vadj->page_size;
-		gtk_adjustment_value_changed (vadj);
-		break;
-	case GDK_BackSpace:
-		if (vadj->value > vadj->lower + page_size)
-			vadj->value -= page_size;
-		else
-			vadj->value = vadj->lower;
-		gtk_adjustment_value_changed (vadj);
-		break;
-	case GDK_Return:
-	case GDK_KP_Enter:
-	case GDK_ISO_Enter:
-       		open_msg (NULL, fb);
-		break;
-	default:
-		return on_key_press ((GtkWidget *)tree, (GdkEventKey *)ev, fb);
-	}
-
-	return TRUE;
-}
-
-static void
-on_double_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, FolderBrowser *fb)
-{
-	/* Ignore double-clicks on columns where single-click doesn't
-	 * just select.
-	 */
-	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
-		return;
-	
-	open_msg (NULL, fb);
-}
-
-static void
-on_selection_changed (GtkObject *obj, gpointer user_data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (user_data);
-	FolderBrowserSelectionState state;
-
-	/* we can get this signal at strange times...
-	 * if no uicomp, don't even bother */
-
-	if (fb->uicomp == NULL)
-		return;
-
-	switch (e_selection_model_selected_count (E_SELECTION_MODEL (obj))) {
-	case 0:
-		state = FB_SELSTATE_NONE;
-		break;
-	case 1:
-		state = FB_SELSTATE_SINGLE;
-		break;
-	default:
-		state = FB_SELSTATE_MULTIPLE;
-		break;
-	}
-
-	folder_browser_ui_set_selection_state (fb, state);
-
-	update_status_bar_idle(fb);
-}
-
-static void
-fb_resize_cb (GtkWidget *w, GtkAllocation *a, FolderBrowser *fb)
-{	
-	if (fb->preview_shown)
-		mail_config_set_paned_size (a->height);
-}
-
-static void
-folder_browser_gui_init (FolderBrowser *fb)
-{
-	extern RuleContext *search_context;
-	ESelectionModel *esm;
-
-	/* The panned container */
-	fb->vpaned = e_vpaned_new ();
-	gtk_widget_show (fb->vpaned);
-	
-	gtk_table_attach (GTK_TABLE (fb), fb->vpaned,
-			  0, 1, 1, 3,
-			  GTK_FILL | GTK_EXPAND,
-			  GTK_FILL | GTK_EXPAND,
-			  0, 0);
-	
-	/* quick-search bar */
-	if (search_context) {
-		const char *systemrules = gtk_object_get_data (GTK_OBJECT (search_context), "system");
-		const char *userrules = gtk_object_get_data (GTK_OBJECT (search_context), "user");
-		
-		fb->search = e_filter_bar_new (search_context, systemrules, userrules,
-					       folder_browser_config_search, fb);
-		e_search_bar_set_menu ((ESearchBar *)fb->search, folder_browser_search_menu_items);
-	}
-	
-	gtk_widget_show (GTK_WIDGET (fb->search));
-	
-	gtk_signal_connect (GTK_OBJECT (fb->search), "query_changed",
-			    GTK_SIGNAL_FUNC (folder_browser_search_do_search), fb);
-	gtk_signal_connect (GTK_OBJECT (fb->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (folder_browser_search_menu_activated), fb);
-	gtk_signal_connect (GTK_OBJECT (fb->search), "search_activated",
-			    GTK_SIGNAL_FUNC (folder_browser_search_do_search), fb);
-	
-	
-	gtk_table_attach (GTK_TABLE (fb), GTK_WIDGET (fb->search),
-			  0, 1, 0, 1,
-			  GTK_FILL | GTK_EXPAND,
-			  0,
-			  0, 0);
-
-	esm = e_tree_get_selection_model (E_TREE (fb->message_list->tree));
-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed", on_selection_changed, fb);
-	fb->selection_state = FB_SELSTATE_NONE; /* default to none */
-
-	e_paned_add1 (E_PANED (fb->vpaned), GTK_WIDGET (fb->message_list));
-	gtk_widget_show (GTK_WIDGET (fb->message_list));
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list), "size_allocate",
-	                    GTK_SIGNAL_FUNC (fb_resize_cb), fb);
-	
-	e_paned_add2 (E_PANED (fb->vpaned), GTK_WIDGET (fb->mail_display));
-	e_paned_set_position (E_PANED (fb->vpaned), mail_config_get_paned_size ());
-	gtk_widget_show (GTK_WIDGET (fb->mail_display));
-	gtk_widget_show (GTK_WIDGET (fb));
-}
-
-/* mark the message seen if the current message still matches */
-static gint 
-do_mark_seen (gpointer data)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (data);
-	
-	if (fb->new_uid && fb->loaded_uid && !strcmp (fb->new_uid, fb->loaded_uid)) {
-		camel_folder_set_message_flags (fb->folder, fb->new_uid, CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-	}
-	
-	return FALSE;
-}
-
-/* callback when we have the message to display, after async loading it (see below) */
-/* if we have pending uid's, it means another was selected before we finished displaying
-   the last one - so we cycle through and start loading the pending one immediately now */
-static void
-done_message_selected (CamelFolder *folder, char *uid, CamelMimeMessage *msg, void *data)
-{
-	FolderBrowser *fb = data;
-	int timeout = mail_config_get_mark_as_seen_timeout ();
-	const char *followup;
-	
-	if (folder != fb->folder || fb->mail_display == NULL)
-		return;
-	
-	followup = camel_folder_get_message_user_tag (folder, uid, "follow-up");
-	
-	mail_display_set_message (fb->mail_display, (CamelMedium *) msg, followup);
-	
-	/* FIXME: should this signal be emitted here?? */
-	gtk_signal_emit (GTK_OBJECT (fb), folder_browser_signals [MESSAGE_LOADED], uid);
-	
-	/* pain, if we have pending stuff, re-run */
-	if (fb->pending_uid) {
-		g_free (fb->loading_uid);
-		fb->loading_uid = fb->pending_uid;
-		fb->pending_uid = NULL;
-		
-		mail_get_message (fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
-		return;
-	}
-	
-	g_free (fb->loaded_uid);
-	fb->loaded_uid = fb->loading_uid;
-	fb->loading_uid = NULL;
-
-	folder_browser_ui_message_loaded (fb);
-	
-	/* if we are still on the same message, do the 'idle read' thing */
-	if (fb->seen_id)
-		gtk_timeout_remove (fb->seen_id);
-	
-	if (mail_config_get_do_seen_timeout () && msg) {
-		if (timeout > 0)
-			fb->seen_id = gtk_timeout_add (timeout, do_mark_seen, fb);
-		else
-			do_mark_seen (fb);
-	}
-}
-
-/* ok we waited enough, display it anyway (see below) */
-static gboolean
-do_message_selected (FolderBrowser *fb)
-{
-	d(printf ("%p: selecting uid %s (delayed)\n", fb, fb->new_uid ? fb->new_uid : "NONE"));
-	
-	fb->loading_id = 0;
-	
-	/* if we are loading, then set a pending, but leave the loading, coudl cancel here (?) */
-	if (fb->loading_uid) {
-		g_free (fb->pending_uid);
-		fb->pending_uid = g_strdup (fb->new_uid);
-	} else {
-		if (fb->new_uid) {
-			fb->loading_uid = g_strdup (fb->new_uid);
-			mail_get_message (fb->folder, fb->loading_uid, done_message_selected, fb, mail_thread_new);
-		} else {
-			mail_display_set_message (fb->mail_display, NULL, NULL);
-		}
-	}
-	
-	return FALSE;
-}
-
-/* when a message is selected, wait a while before trying to display it */
-static void
-on_message_selected (MessageList *ml, const char *uid, FolderBrowser *fb)
-{
-	d(printf ("%p: selecting uid %s (direct)\n", fb, uid ? uid : "NONE"));
-	
-	if (fb->loading_id != 0)
-		gtk_timeout_remove (fb->loading_id);
-	
-	g_free (fb->new_uid);
-	fb->new_uid = g_strdup (uid);
-	
-	if (fb->preview_shown)
-		fb->loading_id = gtk_timeout_add (100, (GtkFunction)do_message_selected, fb);
-}
-
-static gboolean
-on_message_list_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	FolderBrowser *fb = (FolderBrowser *) user_data;
-	
-	printf ("got focus!\n");
-	folder_browser_ui_message_list_focus (fb);
-	
-	return FALSE;
-}
-
-static gboolean
-on_message_list_focus_out (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-	FolderBrowser *fb = (FolderBrowser *) user_data;
-	
-	printf ("got unfocus!\n");
-	folder_browser_ui_message_list_unfocus (fb);
-	
-	return FALSE;
-}
-
-static void
-folder_browser_init (GtkObject *object)
-{
-	FolderBrowser *fb = (FolderBrowser *)object;
-
-	fb->async_event = mail_async_event_new();
-	fb->get_id = -1;
-}
-
-static void
-my_folder_browser_init (GtkObject *object)
-{
-	FolderBrowser *fb = FOLDER_BROWSER (object);
-	int i;
-	
-	fb->view_instance = NULL;
-	fb->view_menus = NULL;
-
-	fb->pref_master = FALSE;
-
-	/*
-	 * Setup parent class fields.
-	 */ 
-	GTK_TABLE (fb)->homogeneous = FALSE;
-	gtk_table_resize (GTK_TABLE (fb), 1, 2);
-	
-	/*
-	 * Our instance data
-	 */
-	fb->message_list = (MessageList *)message_list_new ();
-	fb->mail_display = (MailDisplay *)mail_display_new ();
-	
-	fb->preview_shown = TRUE;
-	
-	gtk_signal_connect (GTK_OBJECT (fb->mail_display->html),
-			    "key_press_event", GTK_SIGNAL_FUNC (on_key_press), fb);
-	gtk_signal_connect (GTK_OBJECT (fb->mail_display->html),
-			    "button_press_event", GTK_SIGNAL_FUNC (html_button_press_event), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->tree),
-			    "key_press", GTK_SIGNAL_FUNC (etree_key), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->tree),
-			    "right_click", GTK_SIGNAL_FUNC (on_right_click), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->tree),
-			    "double_click", GTK_SIGNAL_FUNC (on_double_click), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list), "focus_in_event",
-			    GTK_SIGNAL_FUNC (on_message_list_focus_in), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list), "focus_out_event",
-			    GTK_SIGNAL_FUNC (on_message_list_focus_out), fb);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list), "message_selected",
-			    on_message_selected, fb);
-	
-	/* drag & drop */
-	e_tree_drag_source_set (fb->message_list->tree, GDK_BUTTON1_MASK,
-				drag_types, num_drag_types, GDK_ACTION_MOVE | GDK_ACTION_COPY);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->tree), "tree_drag_data_get",
-			    GTK_SIGNAL_FUNC (message_list_drag_data_get), fb);
-	
-	e_tree_drag_dest_set (fb->message_list->tree, GTK_DEST_DEFAULT_ALL,
-			      drag_types, num_drag_types, GDK_ACTION_MOVE | GDK_ACTION_COPY);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->message_list->tree), "tree_drag_data_received",
-			    GTK_SIGNAL_FUNC (message_list_drag_data_received), fb);
-	
-	/* cut, copy & paste */
-	fb->invisible = gtk_invisible_new ();
-	
-	for (i = 0; i < num_paste_types; i++)
-		gtk_selection_add_target (fb->invisible, clipboard_atom,
-					  paste_types[i].target,
-					  paste_types[i].info);
-	
-	gtk_signal_connect (GTK_OBJECT (fb->invisible),
-			    "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get),
-			    (gpointer) fb);
-	gtk_signal_connect (GTK_OBJECT (fb->invisible),
-			    "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    (gpointer) fb);
-	gtk_signal_connect (GTK_OBJECT (fb->invisible),
-			    "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    (gpointer) fb);
-	
-	folder_browser_gui_init (fb);
-}
-
-GtkWidget *
-folder_browser_new (const GNOME_Evolution_Shell shell, const char *uri)
-{
-	CORBA_Environment ev;
-	FolderBrowser *folder_browser;
-	
-	CORBA_exception_init (&ev);
-
-	folder_browser = gtk_type_new (folder_browser_get_type ());
-
-	my_folder_browser_init (GTK_OBJECT (folder_browser));
-
-	folder_browser->shell = CORBA_Object_duplicate (shell, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		folder_browser->shell = CORBA_OBJECT_NIL;
-		gtk_widget_destroy (GTK_WIDGET (folder_browser));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-	
-	if (uri) {
-		folder_browser->uri = g_strdup (uri);
-		gtk_object_ref (GTK_OBJECT (folder_browser));
-		folder_browser->get_id = mail_get_folder (folder_browser->uri, 0, got_folder,
-							  folder_browser, mail_thread_new);
-	}
-
-	return GTK_WIDGET (folder_browser);
-}
-
-
-E_MAKE_TYPE (folder_browser, "FolderBrowser", FolderBrowser, folder_browser_class_init, folder_browser_init, PARENT_TYPE);