Commit progress, which breaks everything.

svn path=/branches/kill-bonobo/; revision=35930

11 files changed, 137 insertions, 1464 deletions

diff --git a/shell/e-shell-module.c b/shell/e-shell-module.c
index 984de1bdfb..39ad1ce847 100644
--- a/shell/e-shell-module.c
+++ b/shell/e-shell-module.c
@@ -245,6 +245,37 @@ e_shell_module_get_view_type (EShellModule *shell_module)
 	return shell_module->priv->info.shell_view_type;
 }
 
+gboolean
+e_shell_module_is_busy (EShellModule *shell_module)
+{
+	g_return_val_if_fail (E_IS_SHELL_MODULE (shell_module), FALSE);
+
+	if (shell_module->priv->info.is_busy != NULL)
+		return shell_module->priv->info.is_busy ();
+
+	return FALSE;
+}
+
+gboolean
+e_shell_module_shutdown (EShellModule *shell_module)
+{
+	g_return_val_if_fail (E_IS_SHELL_MODULE (shell_module), TRUE);
+
+	if (shell_module->priv->info.shutdown != NULL)
+		return shell_module->priv->info.shutdown ();
+
+	return TRUE;
+}
+
+void
+e_shell_module_send_and_receive (EShellModule *shell_module)
+{
+	g_return_if_fail (E_IS_SHELL_MODULE (shell_module));
+
+	if (shell_module->priv->info.send_and_receive != NULL)
+		shell_module->priv->info.send_and_receive ();
+}
+
 void
 e_shell_module_window_created (EShellModule *shell_module,
                                EShellWindow *shell_window)
@@ -267,4 +298,7 @@ e_shell_module_set_info (EShellModule *shell_module,
 	shell_module->priv->info.aliases = g_intern_string (info->aliases);
 	shell_module->priv->info.schemas = g_intern_string (info->schemas);
 	shell_module->priv->info.shell_view_type = info->shell_view_type;
+
+	shell_module->priv->info.request_quit = info->request_quit;
+	shell_module->priv->info.window_created = info->window_created;
 }
diff --git a/shell/e-shell-module.h b/shell/e-shell-module.h
index 175b6dacde..90e4be977d 100644
--- a/shell/e-shell-module.h
+++ b/shell/e-shell-module.h
@@ -56,7 +56,10 @@ struct _EShellModuleInfo {
 	const gchar *schemas;   /* colon-separated list */
 	GType shell_view_type;  /* EShellView subclass  */
 
-	void (*window_created) (EShellWindow *window);
+	gboolean	(*is_busy)		(void);
+	gboolean	(*shutdown)		(void);
+	void		(*send_and_receive)	(void);
+	void		(*window_created)	(EShellWindow *window);
 };
 
 struct _EShellModule {
@@ -74,6 +77,9 @@ gint		e_shell_module_compare		(EShellModule *shell_module_a,
 						 EShellModule *shell_module_b);
 const gchar *	e_shell_module_get_filename	(EShellModule *shell_module);
 GType		e_shell_module_get_view_type	(EShellModule *shell_module);
+gboolean	e_shell_module_is_busy		(EShellModule *shell_module);
+gboolean	e_shell_module_shutdown		(EShellModule *shell_module);
+void		e_shell_module_send_and_receive	(EShellModlue *shell_module);
 void		e_shell_module_window_created	(EShellModule *shell_module,
 						 EShellWindow *shell_window);
 void		e_shell_module_set_info		(EShellModule *shell_module,
diff --git a/shell/e-shell-registry.c b/shell/e-shell-registry.c
index 9c988aa43e..8329b59444 100644
--- a/shell/e-shell-registry.c
+++ b/shell/e-shell-registry.c
@@ -118,6 +118,12 @@ e_shell_registry_init (void)
 	g_dir_close (dir);
 }
 
+GList *
+e_shell_registry_list_modules (void)
+{
+	return g_list_copy (loaded_modules);
+}
+
 GType *
 e_shell_registry_get_view_types (guint *n_types)
 {
@@ -146,13 +152,6 @@ e_shell_registry_get_view_types (guint *n_types)
 	return types;
 }
 
-void
-e_shell_registry_foreach_module (GFunc func,
-                                 gpointer user_data)
-{
-	g_list_foreach (loaded_modules, func, user_data);
-}
-
 EShellModule *
 e_shell_registry_get_module_by_name (const gchar *name)
 {
diff --git a/shell/e-shell-registry.h b/shell/e-shell-registry.h
index a1ad6449f9..07e1acaf4b 100644
--- a/shell/e-shell-registry.h
+++ b/shell/e-shell-registry.h
@@ -27,9 +27,8 @@
 G_BEGIN_DECLS
 
 void		e_shell_registry_init			(void);
+GList *		e_shell_registry_list_modules		(void);
 GType *		e_shell_registry_get_view_types		(guint *n_types);
-void		e_shell_registry_foreach_module		(GFunc func,
-							 gpointer user_data);
 EShellModule *	e_shell_registry_get_module_by_name	(const gchar *name);
 EShellModule *	e_shell_registry_get_module_by_schema	(const gchar *schema);
 
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 580f147920..e11563fa10 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -656,8 +656,15 @@ static void
 action_close_cb (GtkAction *action,
                  EShellWindow *window)
 {
-	if (e_shell_request_close_window (window))
-		gtk_widget_destroy (GTK_WIDGET (window));
+	GtkWidget *widget = GTK_WIDGET (window);
+	GdkEvent *event;
+
+	/* Synthesize a delete_event on this window. */
+	event = gdk_event_new (GDK_DELETE);
+	event->any.window = g_object_ref (widget->window);
+	event->any.send_event = TRUE;
+	gtk_main_do_event (event);
+	gdk_event_free (event);
 }
 
 static void
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index bdf0dc3484..4c278e9b48 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -270,6 +270,8 @@ e_shell_window_private_dispose (EShellWindow *window)
 #elif NM_SUPPORT
 	e_shell_dbus_dispose (E_SHELL_WINDOW (object));
 #endif
+
+	priv->destroyed = TRUE;
 }
 
 void
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index deb27e85f5..53a086fba9 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -33,6 +33,10 @@
 #include "e-online-button.h"
 #include "e-sidebar.h"
 
+#define E_SHELL_WINDOW_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_SHELL_WINDOW, EShellWindowPrivate))
+
 /* Shorthand, requires a variable named "window". */
 #define ACTION(name)		(E_SHELL_WINDOW_ACTION_##name (window))
 #define ACTION_GROUP(name)	(E_SHELL_WINDOW_ACTION_GROUP_##name (window))
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 97eed86690..4097a92314 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -22,8 +22,7 @@
 #include <config.h>
 #endif
 
-#include "e-shell-window.h"
-#include "e-shell-view.h"
+#include "e-shell-window-private.h"
 
 #include "e-util/e-plugin-ui.h"
 #include "e-util/e-util-private.h"
@@ -45,55 +44,10 @@
 static gpointer parent_class;
 
 static void
-shell_window_update_title (EShellWindow *window)
-{
-	EShellView *shell_view;
-	const gchar *title = _("Evolution");
-	gchar *buffer = NULL;
-
-	shell_view = window->priv->current_view;
-	if (shell_view != NULL)
-		title = e_shell_view_get_title (shell_view);
-
-	if (shell_view != NULL && title == NULL) {
-		const gchar *id;
-
-		id = e_shell_view_get_id (shell_view);
-
-		/* Translators: This is the window title and %s is the
-		 * view name.  Most translators will want to keep it as is. */
-		buffer = g_strdup_printf (_("%s - Evolution"), id);
-
-		title = buffer;
-	}
-
-	gtk_window_set_title (GTK_WINDOW (window), title);
-
-	g_free (buffer);
-}
-
-static void
 shell_window_dispose (GObject *object)
 {
-	EShellWindowPrivate *priv;
-
-	priv = E_SHELL_WINDOW_GET_PRIVATE (object);
-
-	priv->destroyed = TRUE;
-
 	e_shell_window_private_dispose (E_SHELL_WINDOW (object));
 
-	if (priv->shell != NULL) {
-		g_object_remove_weak_pointer (
-			G_OBJECT (priv->shell), &priv->shell);
-		priv->shell = NULL;
-	}
-
-	if (priv->current_view != NULL) {
-		g_object_unref (priv->current_view);
-		priv->current_view = NULL;
-	}
-
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -101,15 +55,8 @@ shell_window_dispose (GObject *object)
 static void
 shell_window_finalize (GObject *object)
 {
-	EShellWindowPrivate *priv;
-
-	priv = E_SHELL_WINDOW_GET_PRIVATE (object);
-
 	e_shell_window_private_finalize (E_SHELL_WINDOW (object));
 
-	g_slist_foreach (priv->component_views, (GFunc) component_view_free, NULL);
-	g_slist_free (priv->component_views);
-
 	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -138,9 +85,6 @@ shell_window_init (EShellWindow *window)
 
 	manager = e_shell_window_get_ui_manager (window);
 
-	window->priv->shell_view = e_shell_view_new (window);
-	window->priv->destroyed = FALSE;
-
 	e_plugin_ui_register_manager (
 		"org.gnome.evolution.shell", manager, window);
 }
@@ -171,17 +115,6 @@ e_shell_window_get_type (void)
 	return type;
 }
 
-const gchar *
-e_shell_window_get_current_view (EShellWindow *window)
-{
-}
-
-void
-e_shell_window_set_current_view (EShellWindow *window,
-                                 const gchar *shell_view_id)
-{
-}
-
 GtkUIManager *
 e_shell_window_get_ui_manager (EShellWindow *window)
 {
@@ -262,6 +195,7 @@ e_shell_window_get_managed_widget (EShellWindow *window,
 	return widget;
 }
 
+#if 0
 static void
 init_view (EShellWindow *window,
 	   ComponentView *view)
@@ -411,10 +345,12 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 
 	g_object_notify (G_OBJECT (window), "current-view");
 }
+#endif
 
 
 /* Functions to update the sensitivity of buttons and menu items depending on the status.  */
 
+#if 0
 static void
 update_offline_toggle_status (EShellWindow *window)
 {
@@ -424,11 +360,10 @@ update_offline_toggle_status (EShellWindow *window)
 	gboolean online;
 	gboolean sensitive;
 	guint32 flags = 0;
-	ESMenuTargetShell *t;
 
 	priv = window->priv;
 
-	switch (e_shell_get_line_status (priv->shell)) {
+	switch (e_shell_get_line_status ()) {
 	case E_SHELL_LINE_STATUS_ONLINE:
 		online      = TRUE;
 		sensitive   = TRUE;
@@ -454,84 +389,9 @@ update_offline_toggle_status (EShellWindow *window)
 		g_return_if_reached ();
 	}
 
-	widget = window->priv->offline_toggle;
+	widget = window->priv->online_button;
 	gtk_widget_set_sensitive (widget, sensitive);
 	gtk_widget_set_tooltip_text (widget, tooltip);
 	e_online_button_set_online (E_ONLINE_BUTTON (widget), online);
-
-	/* TODO: If we get more shell flags, this should be centralised */
-	t = es_menu_target_new_shell(priv->menu, flags);
-	t->target.widget = (GtkWidget *)window;
-	e_menu_update_target((EMenu *)priv->menu, t);
-}
-
-static void
-update_send_receive_sensitivity (EShellWindow *window)
-{
-	if (e_shell_get_line_status (window->priv->shell) == E_SHELL_LINE_STATUS_OFFLINE || 
-		e_shell_get_line_status (window->priv->shell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE)
-		bonobo_ui_component_set_prop (window->priv->ui_component,
-					      "/commands/SendReceive",
-					      "sensitive", "0", NULL);
-	else
-		bonobo_ui_component_set_prop (window->priv->ui_component,
-					      "/commands/SendReceive",
-					      "sensitive", "1", NULL);
-}
-
-
-/* Callbacks.  */
-
-static ComponentView *
-get_component_view (EShellWindow *window, int id)
-{
-	GSList *p;
-
-	for (p = window->priv->component_views; p; p = p->next) {
-		if (((ComponentView *) p->data)->button_id == id)
-			return p->data;
-	}
-
-	g_warning ("Unknown component button id %d", id);
-	return NULL;
-}
-
-static void
-sidebar_button_selected_callback (ESidebar *sidebar,
-				  int button_id,
-				  EShellWindow *window)
-{
-	ComponentView *component_view;
-
-	if ((component_view = get_component_view (window, button_id)))
-		switch_view (window, component_view);
-}
-
-static gboolean
-sidebar_button_pressed_callback (ESidebar       *sidebar,
-				 GdkEventButton *event,
-				 int             button_id,
-				 EShellWindow   *window)
-{
-	if (event->type == GDK_BUTTON_PRESS &&
-	    event->button == 2) {
-		/* open it in a new window */
-		ComponentView *component_view;
-
-		if ((component_view = get_component_view (window, button_id))) {
-			e_shell_create_window (window->priv->shell,
-					       component_view->component_id);
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static void
-shell_line_status_changed_callback (EShell *shell,
-				    EShellLineStatus new_status,
-				    EShellWindow *window)
-{
-	update_offline_toggle_status (window);
-	update_send_receive_sensitivity (window);
 }
+#endif
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index f883a195a6..17e1a172ee 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -59,9 +59,6 @@ struct _EShellWindowClass {
 };
 
 GType		e_shell_window_get_type		(void);
-gint		e_shell_window_get_current_view	(EShellWindow *window);
-void		e_shell_window_set_current_view	(EShellWindow *window,
-						 gint current_view);
 GtkUIManager *	e_shell_window_get_ui_manager	(EShellWindow *window);
 GtkAction *	e_shell_window_get_action	(EShellWindow *window,
 						 const gchar *action_name);
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ce8d0a2d23..81f89c4343 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -18,1339 +18,101 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
-
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#elif defined (GDK_WINDOWING_WIN32)
-/* gdkwin32.h includes <windows.h> which stomps over the namespace */
-#undef DATADIR
-#define interface windows_interface
-#include <gdk/gdkwin32.h>
-#undef interface
-#endif
-
-#include <glib/gi18n.h>
-#include <libgnome/gnome-util.h>
-
-#include <gconf/gconf-client.h>
-
-#include <bonobo-activation/bonobo-activation.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-moniker-util.h>
-
-#include <libedataserver/e-xml-utils.h>
-#include <libedataserverui/e-passwords.h>
-
-#include "e-util/e-bconf-map.h"
-#include "e-util/e-dialog-utils.h"
-#include "e-util/e-error.h"
-#include "e-util/e-fsutils.h"
-#include "e-util/e-util.h"
-
-#include "Evolution.h"
-#include "e-shell-constants.h"
-#include "e-shell-marshal.h"
-#include "e-shell-settings-dialog.h"
 #include "e-shell.h"
-#include "e-shell-view.h"
-#include "es-event.h"
-#include "evolution-listener.h"
-#include "evolution-shell-component-utils.h"
-
-static void set_line_status_complete(EvolutionListener *el, void *data);
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-static gboolean session_started = FALSE;
-
-struct _EShellPrivate {
-	/* IID for registering the object on OAF.  */
-	char *iid;
-
-	GList *windows;
 
-	EComponentRegistry *component_registry;
+#define SHUTDOWN_TIMEOUT	500  /* milliseconds */
 
-	/* Line status and controllers  */
-	EShellLineStatus line_status;
-	int line_status_pending;
-	EShellLineStatus line_status_working;
-	EvolutionListener *line_status_listener;
-
-	/* Settings Dialog */
-	union {
-		GtkWidget *widget;
-		gpointer pointer;
-	} settings_dialog;
-
-	/* If we're quitting and things are still busy, a timeout handler */
-	guint quit_timeout;
-
-	/* Whether the shell is succesfully initialized.  This is needed during
-	   the start-up sequence, to avoid CORBA calls to do make wrong things
-	   to happen while the shell is initializing.  */
-	unsigned int is_initialized : 1;
-
-	/* Wether the shell is working in "interactive" mode or not.
-	   (Currently, it's interactive IIF there is at least one active
-	   view.)  */
-	unsigned int is_interactive : 1;
-
-	/* Whether quit has been requested, and the shell is now waiting for
-	   permissions from all the components to quit.  */
-	unsigned int preparing_to_quit : 1;
-};
-
-
-/* Signals.  */
-
-enum {
-	NO_WINDOWS_LEFT,
-	LINE_STATUS_CHANGED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-
-/* Utility functions.  */
+static GList *active_windows;
+static gboolean session_started;
+static gboolean shutting_down;
 
 static gboolean
-get_config_start_offline (void)
-{
-	GConfClient *client;
-	gboolean value;
-
-	client = gconf_client_get_default ();
-
-	value = gconf_client_get_bool (client, "/apps/evolution/shell/start_offline", NULL);
-
-	g_object_unref (client);
-
-	return value;
-}
-
-
-/* Interactivity handling.  */
-
-static void
-set_interactive (EShell *shell,
-		 gboolean interactive)
+shell_window_delete_event_cb (EShellWindow *shell_window)
 {
-	GSList *component_list;
-	GSList *p;
-	GList *first_element;
-	int num_windows;
-	GtkWidget *view;
-
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	shell->priv->is_interactive = interactive;
-
-	num_windows = g_list_length (shell->priv->windows);
-
-	/* We want to send the "interactive" message only when the first
-	window is created */
-	if (num_windows != 1)
-		return;
-
-	first_element = g_list_first (shell->priv->windows);
-	view = GTK_WIDGET (first_element->data);
-
-	component_list = e_component_registry_peek_list (shell->priv->component_registry);
-
-	for (p = component_list; p != NULL; p = p->next) {
-		EComponentInfo *info = p->data;
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-
-#ifdef GDK_WINDOWING_X11
-		GNOME_Evolution_Component_interactive (info->iface, interactive,GPOINTER_TO_INT (GDK_WINDOW_XWINDOW (view->window)), &ev);
-#elif defined (GDK_WINDOWING_WIN32)
-		GNOME_Evolution_Component_interactive (info->iface, interactive,GPOINTER_TO_INT (GDK_WINDOW_HWND (view->window)), &ev);
-#else
-#error Port this to your windowing system
-#endif
-
-		/* Ignore errors, the components can decide to not implement
-		   this interface. */
-
-		CORBA_exception_free (&ev);
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static gboolean
-raise_exception_if_not_ready (PortableServer_Servant servant,
-			      CORBA_Environment *ev)
-{
-	EShell *shell;
-
-	shell = E_SHELL (bonobo_object_from_servant (servant));
-
-	if (! shell->priv->is_initialized) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Shell_NotReady, NULL);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static GNOME_Evolution_ShellView
-impl_Shell_createNewWindow (PortableServer_Servant servant,
-			    const CORBA_char *component_id,
-			    CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EShell *shell;
-	EShellWindow *shell_window;
-	EShellView *shell_view;
-
-	if (raise_exception_if_not_ready (servant, ev))
-		return CORBA_OBJECT_NIL;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-
-	if (component_id[0] == '\0')
-		component_id = NULL;
-
-	shell_window = e_shell_create_window (shell, component_id);
-	if (shell_window == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	/* refs?? */
-	shell_view = e_shell_view_new(shell_window);
-
-	return BONOBO_OBJREF(shell_view);
-
-}
-
-static void
-impl_Shell_handleURI (PortableServer_Servant servant,
-		      const CORBA_char *uri,
-		      CORBA_Environment *ev)
-{
-	EShell *shell = E_SHELL (bonobo_object_from_servant (servant));
-	EComponentInfo *component_info;
-	char *schema, *p;
-	int show = FALSE;
-
-	schema = g_alloca(strlen(uri)+1);
-	strcpy(schema, uri);
-	p = strchr(schema, ':');
-	if (p)
-		*p = 0;
-
- 	component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
-	if (component_info == NULL) {
-		show = TRUE;
-		component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema);
-	}
-
-	if (component_info == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL);
-		return;
-	}
-
-	if (show) {
-		GtkWidget *shell_window;
-
-		shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id);
-		if (shell_window == NULL) {
-			CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
-			return;
-		}
-	}
-
-	GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
-	/* not an error not to implement it */
-	if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)
-		memset(ev, 0, sizeof(*ev));
-}
-
-static void
-impl_Shell_setLineStatus (PortableServer_Servant servant,
-			  CORBA_boolean online,
-			  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	EShell *shell;
-
-	if (raise_exception_if_not_ready (servant, ev))
-		return;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	shell = E_SHELL (bonobo_object);
-
-	/* let the password manager know out online status */
-	e_passwords_set_online(online);
-
-	if (online)
-		e_shell_go_online (shell, NULL, GNOME_Evolution_USER_ONLINE);
-	else
-		e_shell_go_offline (shell, NULL, GNOME_Evolution_USER_OFFLINE);
-}
-
-/* EShellWindow handling and bookkeeping.  */
-
-static int
-window_delete_event_cb (GtkWidget *widget,
-		      GdkEventAny *ev,
-		      void *data)
-{
-	EShell *shell;
-
-	g_return_val_if_fail (E_IS_SHELL_WINDOW (widget), TRUE);
-	shell = E_SHELL (data);
-
-	return ! e_shell_request_close_window (shell, E_SHELL_WINDOW (widget));
-}
-
-static gboolean
-notify_no_windows_left_idle_cb (void *data)
-{
-	EShell *shell;
-	EShellPrivate *priv;
-
-	shell = E_SHELL (data);
-	priv = shell->priv;
-
-	set_interactive (shell, FALSE);
-
-	g_signal_emit (shell, signals [NO_WINDOWS_LEFT], 0);
-
-	if (priv->iid != NULL)
-		bonobo_activation_active_server_unregister (priv->iid,
-							    bonobo_object_corba_objref (BONOBO_OBJECT (shell)));
-	bonobo_object_unref (BONOBO_OBJECT (shell));
-
-	return FALSE;
-}
-
-static void
-window_weak_notify (void *data,
-		    GObject *where_the_object_was)
-{
-	EShell *shell;
-	int num_windows;
-
-	shell = E_SHELL (data);
-
-	num_windows = g_list_length (shell->priv->windows);
-
-	/* If this is our last window, save settings now because in the callback
-	   for no_windows_left shell->priv->windows will be NULL and settings won't
-	   be saved because of that.  */
-	if (num_windows == 1)
-		e_shell_save_settings (shell);
-
-	shell->priv->windows = g_list_remove (shell->priv->windows, where_the_object_was);
-
-	if (shell->priv->windows == NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (shell));
-		g_idle_add (notify_no_windows_left_idle_cb, shell);
-	}
-}
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	EShell *shell;
-	EShellPrivate *priv;
-	GList *p;
-
-	shell = E_SHELL (object);
-	priv = shell->priv;
-
-	priv->is_initialized = FALSE;
-
-	if (priv->component_registry != NULL) {
-		g_object_unref (priv->component_registry);
-		priv->component_registry = NULL;
-	}
-
-	if (priv->quit_timeout) {
-		g_source_remove(priv->quit_timeout);
-		priv->quit_timeout = 0;
-	}
-
-	for (p = priv->windows; p != NULL; p = p->next) {
-		EShellWindow *window;
-
-		window = E_SHELL_WINDOW (p->data);
-
-		g_signal_handlers_disconnect_by_func (window, G_CALLBACK (window_delete_event_cb), shell);
-		g_object_weak_unref (G_OBJECT (window), window_weak_notify, shell);
-
-		gtk_object_destroy (GTK_OBJECT (window));
-	}
-
-	g_list_free (priv->windows);
-	priv->windows = NULL;
-
-	/* No unreffing for these as they are aggregate.  */
-	/* bonobo_object_unref (BONOBO_OBJECT (priv->corba_storage_registry)); */
-
-	if (priv->settings_dialog.widget != NULL) {
-		gtk_widget_destroy (priv->settings_dialog.widget);
-		priv->settings_dialog.widget = NULL;
-	}
-
-	if (priv->line_status_listener) {
-		priv->line_status_listener->complete = NULL;
-		bonobo_object_unref(BONOBO_OBJECT(priv->line_status_listener));
-		priv->line_status_listener = NULL;
-	}
-
-	g_free (priv->iid);
-	(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* Initialization.  */
-
-static void
-e_shell_class_init (EShellClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Shell__epv *epv;
-
-	parent_class = g_type_class_ref(PARENT_TYPE);
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->dispose  = impl_dispose;
-
-	signals[NO_WINDOWS_LEFT] =
-		g_signal_new ("no_windows_left",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EShellClass, no_windows_left),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	signals[LINE_STATUS_CHANGED] =
-		g_signal_new ("line_status_changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EShellClass, line_status_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_INT);
-
-	epv = & klass->epv;
-	epv->createNewWindow = impl_Shell_createNewWindow;
-	epv->handleURI       = impl_Shell_handleURI;
-	epv->setLineStatus   = impl_Shell_setLineStatus;
-/*	epv->findComponent   = impl_Shell_findComponent;*/
-}
-
-static void
-e_shell_init (EShell *shell)
-{
-	EShellPrivate *priv;
-
-	priv = g_new0 (EShellPrivate, 1);
-	priv->line_status                  = E_SHELL_LINE_STATUS_OFFLINE;
-	priv->component_registry           = e_component_registry_new ();
-
-	shell->priv = priv;
-
-	priv->line_status_listener = evolution_listener_new(set_line_status_complete, shell);
-}
-
-static void
-detect_version (GConfClient *gconf, int *major, int *minor, int *revision)
-{
-	char *val, *evolution_dir;
-	struct stat st;
-
-	evolution_dir = g_build_filename (g_get_home_dir (), "evolution", NULL);
-
-	val = gconf_client_get_string(gconf, "/apps/evolution/version", NULL);
-	if (val) {
-		/* Since 1.4.0 We've been keeping the version key in gconf */
-		sscanf(val, "%d.%d.%d", major, minor, revision);
-		g_free(val);
-	} else if (g_lstat (evolution_dir, &st) != 0 || !S_ISDIR (st.st_mode)) {
-		/* If ~/evolution does not exit or is not a directory it must be a new installation */
-		*major = 0;
-		*minor = 0;
-		*revision = 0;
-	} else {
-		xmlDocPtr config_doc;
-		xmlNodePtr source;
-		char *tmp;
-
-		tmp = g_build_filename (evolution_dir, "config.xmldb", NULL);
-		config_doc = e_xml_parse_file (tmp);
-		g_free (tmp);
-		tmp = NULL;
-
-		if (config_doc
-		    && (source = e_bconf_get_path (config_doc, "/Shell"))
-		    && (tmp = e_bconf_get_value (source, "upgrade_from_1_0_to_1_2_performed"))
-		    && tmp[0] == '1' ) {
-			*major = 1;
-			*minor = 2;
-			*revision = 0;
-		} else {
-			*major = 1;
-			*minor = 0;
-			*revision = 0;
-		}
-		g_free (tmp);
-		if (config_doc)
-			xmlFreeDoc (config_doc);
-	}
-
-	g_free (evolution_dir);
-}
-
-/* calls components to perform upgrade */
-static gboolean
-attempt_upgrade (EShell *shell, int major, int minor, int revision)
-{
-	GSList *component_infos, *p;
-	gboolean success;
-	int res;
-
-	success = TRUE;
-
-	component_infos = e_component_registry_peek_list (shell->priv->component_registry);
-	for (p = component_infos; success && p != NULL; p = p->next) {
-		const EComponentInfo *info = p->data;
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-
-		GNOME_Evolution_Component_upgradeFromVersion (info->iface, major, minor, revision, &ev);
-
-		if (BONOBO_EX (&ev)) {
-			char *exception_text;
-			CORBA_char *id = CORBA_exception_id(&ev);
-
-			if (strcmp (id, ex_CORBA_NO_IMPLEMENT) == 0) {
-				/* Ignore components that do not implement this version, it
-				   might just mean that they don't need an upgrade path. */
-			} else if (strcmp (id,  ex_GNOME_Evolution_Component_UpgradeFailed) == 0) {
-				GNOME_Evolution_Component_UpgradeFailed *ex = CORBA_exception_value(&ev);
-
-				res = e_error_run(NULL, "shell:upgrade-failed", ex->what, ex->why, NULL);
-				if (res == GTK_RESPONSE_CANCEL)
-					success = FALSE;
-			} else if (strcmp (id,  ex_GNOME_Evolution_Component_UnsupportedVersion) == 0) {
-				/* This is non-fatal */
-				/* DO WE CARE??? */
-				printf("Upgrade of component failed, unsupported prior version\n");
-			} else {
-				exception_text = bonobo_exception_get_text (&ev);
-				res = e_error_run(NULL, "shell:upgrade-failed", exception_text, _("Unknown system error."), NULL);
-				g_free (exception_text);
-				if (res == GTK_RESPONSE_CANCEL)
-					success = FALSE;
-			}
-		}
-		CORBA_exception_free (&ev);
-	}
-
-	return success;
-}
-
-/**
- * e_shell_construct:
- * @shell: An EShell object to construct
- * @iid: OAFIID for registering the shell into the name server
- * @startup_line_mode: How to set up the line mode (online or offline) initally.
- *
- * Construct @shell so that it uses the specified @corba_object.
- *
- * Return value: The result of the operation.
- **/
-EShellConstructResult
-e_shell_construct (EShell *shell,
-		   const char *iid,
-		   EShellStartupLineMode startup_line_mode)
-{
-	EShellPrivate *priv;
-	CORBA_Object corba_object;
-	gboolean start_online;
-	GSList *component;
-
-	g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
-	g_return_val_if_fail (startup_line_mode == E_SHELL_STARTUP_LINE_MODE_CONFIG
-			      || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_ONLINE
-			      || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_OFFLINE,
-			      E_SHELL_CONSTRUCT_RESULT_INVALIDARG);
-
-	priv = shell->priv;
-	priv->iid = g_strdup (iid);
-
-	/* Now we can register into OAF.  Notice that we shouldn't be
-	   registering into OAF until we are sure we can complete.  */
-
-	/* FIXME: Multi-display stuff.  */
-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
-	if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS)
-		return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER;
-
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-
-	/* activate all the components (peek list does this implictly) */
-	/* Do we really need to assign the result of this to the list? */
-	component = e_component_registry_peek_list (shell->priv->component_registry);
-
-	e_shell_attempt_upgrade(shell);
-
-	priv->is_initialized = TRUE;
-
-	switch (startup_line_mode) {
-	case E_SHELL_STARTUP_LINE_MODE_CONFIG:
-		start_online = ! get_config_start_offline ();
-		break;
-	case E_SHELL_STARTUP_LINE_MODE_ONLINE:
-		start_online = TRUE;
-		break;
-	case E_SHELL_STARTUP_LINE_MODE_OFFLINE:
-		start_online = FALSE;
-		break;
-	default:
-		start_online = FALSE; /* Make compiler happy.  */
-		g_return_val_if_reached(E_SHELL_CONSTRUCT_RESULT_OK);
-	}
-
-	e_passwords_set_online(start_online);
-
-	if (start_online)
-		e_shell_go_online (shell, NULL, GNOME_Evolution_USER_ONLINE);
-	else
-		e_shell_go_online (shell, NULL, GNOME_Evolution_USER_OFFLINE);
-
-	return E_SHELL_CONSTRUCT_RESULT_OK;
-}
-
-/**
- * e_shell_new:
- * @start_online: Whether to start in on-line mode or not.
- * @construct_result_return: A pointer to an EShellConstructResult variable into
- * which the result of the operation will be stored.
- *
- * Create a new EShell.
- *
- * Return value:
- **/
-EShell *
-e_shell_new (EShellStartupLineMode startup_line_mode,
-	     EShellConstructResult *construct_result_return)
-{
-	EShell *new;
-	EShellConstructResult construct_result;
-
-	new = g_object_new (e_shell_get_type (), NULL);
-
-	construct_result = e_shell_construct (new, E_SHELL_OAFIID, startup_line_mode);
-
-	if (construct_result != E_SHELL_CONSTRUCT_RESULT_OK) {
-		*construct_result_return = construct_result;
-		bonobo_object_unref (BONOBO_OBJECT (new));
-		return NULL;
-	}
-
-	*construct_result_return = E_SHELL_CONSTRUCT_RESULT_OK;
-	return new;
-}
-
-static int
-remove_dir(const char *root, const char *path)
-{
-	GDir *dir;
-	const char *dname;
-	int res = -1;
-	char *new = NULL;
-	struct stat st;
-
-	dir = g_dir_open(path, 0, NULL);
-	if (dir == NULL)
-		return -1;
-
-	while ( (dname = g_dir_read_name(dir)) ) {
-		new = g_build_filename(path, dname, NULL);
-		if (g_stat(new, &st) == -1)
-			goto fail;
-
-		/* make sure we're really removing something from evolution dir */
-		g_return_val_if_fail (strlen(path) >= strlen(root)
-			 && strncmp(root, path, strlen(root)) == 0, -1);
-
-		if (S_ISDIR(st.st_mode)) {
-			if (remove_dir(root, new) == -1)
-				goto fail;
-		} else {
-			if (g_unlink(new) == -1)
-				goto fail;
-		}
-		g_free(new);
-		new = NULL;
-	}
-
-	res = g_rmdir(path);
-fail:
-	g_free(new);
-	g_dir_close(dir);
-	return res;
-}
-
-/**
- * e_shell_attempt_upgrade:
- * @shell:
- *
- * Upgrade config and components from the currently installed version.
- *
- * Return value: %TRUE If it works.  If it fails the application will exit.
- **/
-gboolean
-e_shell_attempt_upgrade (EShell *shell)
-{
-	GConfClient *gconf_client;
-	int major = 0, minor = 0, revision = 0;
-	int lmajor, lminor, lrevision;
-	int cmajor, cminor, crevision;
-	char *version_string, *last_version = NULL;
-	int done_upgrade = FALSE;
-	char *oldpath;
-	struct stat st;
-	ESEvent *ese;
-
-	gconf_client = gconf_client_get_default();
-
-	oldpath = g_build_filename(g_get_home_dir(), "evolution", NULL);
-
-	g_return_val_if_fail (sscanf(BASE_VERSION, "%u.%u", &cmajor, &cminor) == 2, TRUE);
-	crevision = atoi(UPGRADE_REVISION);
-
-	detect_version (gconf_client, &major, &minor, &revision);
-
-	if (!(cmajor > major
-	      || (cmajor == major && cminor > minor)
-	      || (cminor == minor && crevision > revision)))
-		goto check_old;
-
-	/* if upgrading from < 1.5, we need to copy most data from ~/evolution to ~/.evolution */
-	if (major == 1 && minor < 5) {
-		long size, space;
-
-		size = e_fsutils_usage(oldpath);
-		space = e_fsutils_avail(g_get_home_dir());
-		if (size != -1 && space != -1 && space < size) {
-			char *required = g_strdup_printf(_("%ld KB"), size);
-			char *have = g_strdup_printf(_("%ld KB"), space);
-
-			e_error_run(NULL, "shell:upgrade-nospace", required, have, NULL);
-			g_free(required);
-			g_free(have);
-			_exit(0);
-		}
-	}
-
-	if (!attempt_upgrade (shell, major, minor, revision))
-		_exit(0);
-
-	/* mark as upgraded */
-	version_string = g_strdup_printf ("%s.%s", BASE_VERSION, UPGRADE_REVISION);
-	gconf_client_set_string (gconf_client, "/apps/evolution/version", version_string, NULL);
-	done_upgrade = TRUE;
-
-check_old:
-	/* if the last upgraded version was old, check for stuff to remove */
-	if (done_upgrade
-	    || 	(last_version = gconf_client_get_string (gconf_client, "/apps/evolution/last_version", NULL)) == NULL
-	    ||  sscanf(last_version, "%d.%d.%d", &lmajor, &lminor, &lrevision) != 3) {
-		lmajor = major;
-		lminor = minor;
-		lrevision = revision;
-	}
-	g_free(last_version);
-
-	if (lmajor == 1 && lminor < 5
-	    && g_stat(oldpath, &st) == 0
-	    && S_ISDIR(st.st_mode)) {
-		int res;
-
-		last_version = g_strdup_printf("%d.%d.%d", lmajor, lminor, lrevision);
-		res = e_error_run(NULL, "shell:upgrade-remove-1-4", last_version, NULL);
-		g_free(last_version);
-
-		switch (res) {
-		case GTK_RESPONSE_OK: /* 'delete' */
-			if (e_error_run(NULL, "shell:upgrade-remove-1-4-confirm", NULL) == GTK_RESPONSE_OK)
-				remove_dir(oldpath, oldpath);
-			else
-				break;
-			/* falls through */
-		case GTK_RESPONSE_ACCEPT: /* 'keep' */
-			lmajor = cmajor;
-			lminor = cminor;
-			lrevision = crevision;
-			break;
-		default:
-			/* cancel - noop */
-			break;
-		}
-	} else {
-		/* otherwise 'last version' is now the same as current */
-		lmajor = cmajor;
-		lminor = cminor;
-		lrevision = crevision;
-	}
-
-	last_version = g_strdup_printf("%d.%d.%d", lmajor, lminor, lrevision);
-	gconf_client_set_string (gconf_client, "/apps/evolution/last_version", last_version, NULL);
-	g_free(last_version);
-
-	g_free(oldpath);
-	g_object_unref (gconf_client);
-
-	/** @Event: Shell attempted upgrade
-	 * @Id: upgrade.done
-	 * @Target: ESMenuTargetState
-	 *
-	 * This event is emitted whenever the shell successfully attempts an upgrade.
-	 *
-	 */
-	ese = es_event_peek();
-	e_event_emit((EEvent *)ese, "upgrade.done", (EEventTarget *)es_event_target_new_upgrade(ese, cmajor, cminor, crevision));
-
-	return TRUE;
-}
-
-/**
- * e_shell_create_window:
- * @shell: The shell for which to create a new window.
- * @component_id: Id or alias of the component to display in the new window.
- *
- * Create a new window for @uri.
- *
- * Return value: The new window.
- **/
-EShellWindow *
-e_shell_create_window (EShell *shell,
-		       const char *component_id)
-{
-	EShellWindow *window;
-
-	g_return_val_if_fail (shell != NULL, NULL);
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	window = E_SHELL_WINDOW (e_shell_window_new (shell, component_id));
-
-	g_signal_connect (window, "delete_event", G_CALLBACK (window_delete_event_cb), shell);
-	g_object_weak_ref (G_OBJECT (window), window_weak_notify, shell);
-	shell->priv->windows = g_list_prepend (shell->priv->windows, window);
-
-	gtk_widget_show (GTK_WIDGET (window));
-
-	e_error_default_parent((GtkWindow *)window);
-
-	set_interactive (shell, TRUE);
-
-	if (!session_started) {
-		ESEvent *ese;
-
-		session_started = TRUE;
-		ese = es_event_peek();
-		e_event_emit((EEvent *)ese, "started.done", (EEventTarget *)es_event_target_new_shell(ese, shell));
-	}
-	return window;
-}
-
-gboolean
-e_shell_request_close_window (EShell *shell,
-			      EShellWindow *shell_window)
-{
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-	g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), FALSE);
-
-	e_shell_save_settings (shell);
-
-	if (g_list_length (shell->priv->windows) != 1) {
-		/* Not the last window.  */
-		return TRUE;
-	}
-
-	return e_shell_quit(shell);
-}
-
-/**
- * e_shell_peek_component_registry:
- * @shell:
- *
- * Get the component registry associated to @shell.
- *
- * Return value:
- **/
-EComponentRegistry *
-e_shell_peek_component_registry (EShell *shell)
-{
-	g_return_val_if_fail (E_IS_SHELL (shell), NULL);
-
-	return shell->priv->component_registry;
-}
-
-
-/**
- * e_shell_save_settings:
- * @shell:
- *
- * Save the settings for this shell.
- *
- * Return value: %TRUE if it worked, %FALSE otherwise.  Even if %FALSE is
- * returned, it is possible that at least part of the settings for the windows
- * have been saved.
- **/
-gboolean
-e_shell_save_settings (EShell *shell)
-{
-	GConfClient *client;
-	gboolean is_offline;
-
-	is_offline = ( e_shell_get_line_status (shell) == E_SHELL_LINE_STATUS_OFFLINE || e_shell_get_line_status (shell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE);
-
-	client = gconf_client_get_default ();
-	gconf_client_set_bool (client, "/apps/evolution/shell/start_offline", is_offline, NULL);
-	g_object_unref (client);
-
-	return TRUE;
-}
-
-/**
- * e_shell_close_all_windows:
- * @shell:
- *
- * Destroy all the windows in @shell.
- **/
-void
-e_shell_close_all_windows (EShell *shell)
-{
-	EShellPrivate *priv;
-	GList *p, *pnext;
-
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	if (shell->priv->windows)
-		e_shell_save_settings (shell);
-
-	priv = shell->priv;
-	for (p = priv->windows; p != NULL; p = pnext) {
-		pnext = p->next;
-
-		/* Note that this will also remove the window from the list... Hence the
-		   need for the pnext variable.  */
-		gtk_widget_destroy (GTK_WIDGET (p->data));
-	}
-}
-
-/**
- * e_shell_get_line_status:
- * @shell: A pointer to an EShell object.
- *
- * Get the line status for @shell.
- *
- * Return value: The current line status for @shell.
- **/
-EShellLineStatus
-e_shell_get_line_status (EShell *shell)
-{
-	g_return_val_if_fail (shell != NULL, E_SHELL_LINE_STATUS_OFFLINE);
-	g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_LINE_STATUS_OFFLINE);
-
-	return shell->priv->line_status;
-}
-
-
-/* Offline/online handling.  */
-
-static void
-set_line_status_finished(EShell *shell)
-{
-	EShellPrivate *priv = shell->priv;
-	ESEvent *ese;
-
-	priv->line_status = priv->line_status_working;
-
-	e_passwords_set_online (priv->line_status == E_SHELL_LINE_STATUS_ONLINE);
-	g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status);
-
-	/** @Event: Shell online state changed
-	 * @Id: state.changed
-	 * @Target: ESMenuTargetState
-	 *
-	 * This event is emitted whenever the shell online state changes.
-	 *
-	 * Only the online and offline states are emitted.
-	 */
-	ese = es_event_peek();
-	e_event_emit((EEvent *)ese, "state.changed", (EEventTarget *)es_event_target_new_state(ese, priv->line_status == E_SHELL_LINE_STATUS_ONLINE));
-}
-
-static void
-set_line_status_complete(EvolutionListener *el, void *data)
-{
-	EShell *shell = data;
-	EShellPrivate *priv = shell->priv;
+	/* If other windows are open we can safely close this one. */
+	if (g_list_length (active_windows) > 1)
+		return FALSE;
 
-	if (priv->line_status_pending > 0) {
-		priv->line_status_pending--;
-		if (priv->line_status_pending == 0)
-			set_line_status_finished(shell);
-	}
+	/* Otherwise we initiate application shutdown. */
+	return !e_shell_quit ();
 }
 
 static void
-set_line_status(EShell *shell, GNOME_Evolution_ShellState shell_state)
-{
-	EShellPrivate *priv;
-	GSList *component_infos;
-	GSList *p;
-	CORBA_Environment ev;
-	GConfClient *client;
-	gboolean status;
-	gboolean forced = FALSE;
-
-	priv = shell->priv;
-
-	if (shell_state == GNOME_Evolution_FORCED_OFFLINE || shell_state == GNOME_Evolution_USER_OFFLINE) {
-		status = FALSE;
-		if (shell_state == GNOME_Evolution_FORCED_OFFLINE)
-			forced = TRUE;
-	} else
-		status = TRUE;
-
-	if ((status && priv->line_status == E_SHELL_LINE_STATUS_ONLINE)
-	    || (!status && priv->line_status == E_SHELL_LINE_STATUS_OFFLINE && !forced))
-		return;
-
-	/* we use 'going offline' to mean 'changing status' now */
-	priv->line_status = E_SHELL_LINE_STATUS_GOING_OFFLINE;
-	g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status);
-
-	client = gconf_client_get_default ();
-	gconf_client_set_bool (client, "/apps/evolution/shell/start_offline", !status, NULL);
-	g_object_unref (client);
-
-	priv->line_status_working = status?E_SHELL_LINE_STATUS_ONLINE: forced?E_SHELL_LINE_STATUS_FORCED_OFFLINE:E_SHELL_LINE_STATUS_OFFLINE;
-	/* we start at 2: setLineStatus could recursively call back, we therefore
-	   `need to not complete till we're really complete */
-	priv->line_status_pending += 2;
-
-	component_infos = e_component_registry_peek_list (priv->component_registry);
-	for (p = component_infos; p != NULL; p = p->next) {
-		EComponentInfo *info = p->data;
-
-		CORBA_exception_init (&ev);
-
-		GNOME_Evolution_Component_setLineStatus(info->iface, shell_state, bonobo_object_corba_objref((BonoboObject *)priv->line_status_listener), &ev);
-		if (ev._major == CORBA_NO_EXCEPTION)
-			priv->line_status_pending++;
-
-		CORBA_exception_free (&ev);
-	}
-
-	priv->line_status_pending -= 2;
-	if (priv->line_status_pending == 0)
-		set_line_status_finished(shell);
-}
-
-/**
- * e_shell_go_offline:
- * @shell:
- * @action_window: Obsolete/unused.
- *
- * Make the shell go into off-line mode.
- **/
-void
-e_shell_go_offline (EShell *shell,
-		    EShellWindow *action_window, GNOME_Evolution_ShellState shell_state)
-{
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (action_window != NULL);
-	g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window));
-
-	set_line_status(shell, shell_state);
-}
-
-/**
- * e_shell_go_online:
- * @shell:
- * @action_window: Obsolete/unused.
- *
- * Make the shell go into on-line mode.
- **/
-void
-e_shell_go_online (EShell *shell,
-		   EShellWindow *action_window, GNOME_Evolution_ShellState shell_state)
-{
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-	g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window));
-
-	set_line_status(shell, shell_state);
-}
-
-void
-e_shell_send_receive (EShell *shell)
-{
-	GSList *component_list;
-	GSList *p;
-
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	component_list = e_component_registry_peek_list (shell->priv->component_registry);
-
-	for (p = component_list; p != NULL; p = p->next) {
-		EComponentInfo *info = p->data;
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-
-		GNOME_Evolution_Component_sendAndReceive (info->iface, &ev);
-
-		/* Ignore errors, the components can decide to not implement
-		   this interface. */
-
-		CORBA_exception_free (&ev);
-	}
-}
-
-
-void
-e_shell_show_settings (EShell *shell,
-		       const char *type,
-		       EShellWindow *shell_window)
+shell_window_weak_notify_cb (gpointer unused,
+                             GObject *where_the_object_was)
 {
-	EShellPrivate *priv;
-
-	g_return_if_fail (shell != NULL);
-	g_return_if_fail (E_IS_SHELL (shell));
-
-	priv = shell->priv;
-
-	if (priv->settings_dialog.widget != NULL) {
-		gdk_window_show (priv->settings_dialog.widget->window);
-		gtk_widget_grab_focus (priv->settings_dialog.widget);
-		return;
-	}
+	active_windows = g_list_remove (active_windows, where_the_object_was);
 
-	priv->settings_dialog.widget = e_shell_settings_dialog_new ();
-
-	if (type != NULL)
-		e_shell_settings_dialog_show_type (E_SHELL_SETTINGS_DIALOG (priv->settings_dialog.widget), type);
-
-	g_object_add_weak_pointer (G_OBJECT (priv->settings_dialog.widget), &priv->settings_dialog.pointer);
-
-	gtk_window_set_transient_for (GTK_WINDOW (priv->settings_dialog.widget), GTK_WINDOW (shell_window));
-	gtk_widget_show (priv->settings_dialog.widget);
+	/* If that was the last window, we're done. */
+	if (active_windows == NULL)
+		gtk_main_quit ();
 }
 
-
-const char *
-e_shell_construct_result_to_string (EShellConstructResult result)
-{
-	switch (result) {
-	case E_SHELL_CONSTRUCT_RESULT_OK:
-		return _("OK");
-	case E_SHELL_CONSTRUCT_RESULT_INVALIDARG:
-		return _("Invalid arguments");
-	case E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER:
-		return _("Cannot register on OAF");
-	case E_SHELL_CONSTRUCT_RESULT_NOCONFIGDB:
-		return _("Configuration Database not found");
-	case E_SHELL_CONSTRUCT_RESULT_GENERICERROR:
-		return _("Generic error");
-	default:
-		return _("Unknown error");
-	}
-}
-
-/* timeout handler, so returns TRUE if we can't quit yet */
 static gboolean
-es_run_quit(EShell *shell)
+shell_shutdown_timeout (void)
 {
-	EShellPrivate *priv;
-	GSList *component_infos;
-	GSList *sp;
-	CORBA_boolean done_quit;
-
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-
-	priv = shell->priv;
-	priv->preparing_to_quit = TRUE;
-
-	component_infos = e_component_registry_peek_list (priv->component_registry);
-	done_quit = TRUE;
-	for (sp = component_infos; sp != NULL; sp = sp->next) {
-		EComponentInfo *info = sp->data;
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
+	GList *list, *iter;
+	gboolean proceed = TRUE;
+	static guint source_id = 0;
+	static guint message_timer = 1;
 
-		done_quit = GNOME_Evolution_Component_quit(info->iface, &ev);
-		if (BONOBO_EX (&ev)) {
-			/* The component might not implement the interface, in which case we assume we can quit. */
-			done_quit = TRUE;
-		}
+	list = e_shell_registry_get_modules ();
 
-		CORBA_exception_free (&ev);
+	/* Any module can defer shutdown if it's still busy. */
+	for (iter = list; proceed && iter != NULL; iter = iter->next) {
+		EShellModule *shell_module = iter->data;
+		proceed = e_shell_module_shutdown (shell_module);
 
-		if (!done_quit)
-			break;
-	}
+		/* Emit a message every few seconds to indicate
+		 * which module(s) we're still waiting on. */
+		if (proceed || message_timer == 0)
+			continue;
 
-	if (done_quit) {
-		if  (priv->quit_timeout) {
-			g_source_remove(priv->quit_timeout);
-			priv->quit_timeout = 0;
-		}
-		e_shell_close_all_windows(shell);
-	} else if (priv->quit_timeout == 0) {
-		priv->quit_timeout = g_timeout_add(500, (GSourceFunc)es_run_quit, shell);
+		g_message (
+			_("Waiting for the \"%s\" module to finish..."),
+			G_TYPE_MODULE (shell_module)->name);
 	}
 
-	return !done_quit;
-}
-
-gboolean
-e_shell_can_quit (EShell *shell)
-{
-	EShellPrivate *priv;
-	GSList *component_infos;
-	GSList *sp;
-	CORBA_boolean can_quit;
-
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
+	message_timer = (message_timer + 1) % 10;
 
-	priv = shell->priv;
+	g_list_free (list);
 
-	if (priv->preparing_to_quit)
-		return FALSE;
+	/* If we're go for shutdown, destroy all shell windows.  Note,
+	 * we iterate over a /copy/ of the active windows list because
+	 * the act of destroying a shell window will modify the active
+	 * windows list, which would otherwise derail the iteration. */
+	if (proceed) {
+		list = g_list_copy (active_windows);
+		g_list_foreach (list, (GFunc) gtk_widget_destroy, NULL);
+		g_list_free (list);
 
-	component_infos = e_component_registry_peek_list (priv->component_registry);
-	can_quit = TRUE;
-	for (sp = component_infos; sp != NULL; sp = sp->next) {
-		EComponentInfo *info = sp->data;
-		CORBA_Environment ev;
+	/* If a module is still busy, try again after a short delay. */
+	} else if (source_id == 0)
+		source_id = g_timeout_add (
+			SHUTDOWN_TIMEOUT, (GSourceFunc)
+			shell_shutdown_timeout, NULL);
 
-		CORBA_exception_init (&ev);
-
-		can_quit = GNOME_Evolution_Component_requestQuit (info->iface, &ev);
-		if (BONOBO_EX (&ev)) {
-			/* The component might not implement the interface, in which case we assume we can quit. */
-			can_quit = TRUE;
-		}
-
-		CORBA_exception_free (&ev);
-
-		if (! can_quit)
-			break;
-	}
-
-	return can_quit;
-}
-
-gboolean
-e_shell_do_quit (EShell *shell)
-{
-	EShellPrivate *priv;
-	GList *p;
-	gboolean can_quit;
-
-	g_return_val_if_fail (E_IS_SHELL (shell), FALSE);
-
-	priv = shell->priv;
-
-	if (priv->preparing_to_quit)
-		return FALSE;
-
-	for (p = shell->priv->windows; p != NULL; p = p->next) {
-		gtk_widget_set_sensitive (GTK_WIDGET (p->data), FALSE);
-
-		if (p == shell->priv->windows)
-			e_shell_window_save_defaults (p->data);
-	}
-
-	can_quit = !es_run_quit (shell);
-
-	/* Mark a safe quit by destroying the lock. */
-	e_file_lock_destroy ();
-
-	return can_quit;
+	/* Return TRUE to repeat the timeout, FALSE to stop it.  This
+	 * may seem backwards if the function was called directly. */
+	return !proceed;
 }
 
-gboolean
-e_shell_quit (EShell *shell)
-{
-	return e_shell_can_quit (shell) && e_shell_do_quit (shell);
-}
-
-/**
- * gboolean (*EMainShellFunc) (EShell *shell, EShellWindow *window, gpointer user_data);
- * Function used in @ref e_shell_foreach_shell_window.
- * @param shell Pointer to EShell.
- * @param window Pointer to EShellWindow.
- * @param user_data User's data passed to @ref main_shell_foreach_shell_window.
- * @return TRUE if need to go to next window, FALSE when stop looking for next window.
- **/
-
-/**
- * e_shell_foreach_shell_window
- * This will call function callback for all known EShellWindow of main shell.
- * When there is no shell active, then this will do nothing.
- * @param shell EShell instance.
- * @param func Function to be called.
- * @param user_data User data to pass to func.
- **/
 void
-e_shell_foreach_shell_window (EShell *shell, EMainShellFunc func, gpointer user_data)
+e_shell_create_window (void)
 {
-	EShellPrivate *priv;
-	GList *p;
+	GtkWidget *shell_window;
 
-	if (!shell)
-		return;
+	shell_window = e_shell_window_new ();
 
-	priv = shell->priv;
+	active_windows = g_list_prepend (active_windows, shell_window);
 
-	for (p = priv->windows; p != NULL; p = p->next) {
-		EShellWindow *window;
+	g_signal_connect (
+		shell_window, "delete-event",
+		G_CALLBACK (shell_window_delete_event_cb), NULL);
 
-		window = E_SHELL_WINDOW (p->data);
+	g_object_weak_ref (
+		G_OBJECT (shell_window), (GWeakNotify)
+		shell_window_weak_notify_cb, NULL);
 
-		if (window && !func (shell, window, user_data))
-			break;
-	}
+	gtk_widget_show (shell_window);
 }
-
-BONOBO_TYPE_FUNC_FULL (EShell, GNOME_Evolution_Shell, PARENT_TYPE, e_shell)
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 88fbf26fae..a2582190b9 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -43,12 +43,15 @@ enum _EShellStartupLineMode {
 };
 
 EShellWindow *	e_shell_create_window		(void);
-gboolean	e_shell_request_close_window	(EShellWindow *shell_window);
 void		e_shell_send_receive		(GtkWindow *parent);
 void		e_shell_show_preferences	(GtkWindow *parent);
 void		e_shell_go_offline		(void);
 void		e_shell_go_online		(void);
-void		e_shell_quit			(void);
+EShellLineStatus
+		e_shell_get_line_status		(void);
+gboolean	e_shell_is_busy			(void);
+gboolean	e_shell_do_quit			(void);
+gboolean	e_shell_quit			(void);
 
 G_END_DECLS