This commit was manufactured by cvs2svn to create tag 'BONOBO_0_31'.BONOBO_0_31

svn path=/tags/BONOBO_0_31/; revision=6435

56 files changed, 0 insertions, 6580 deletions

diff --git a/executive-summary/.cvsignore b/executive-summary/.cvsignore
deleted file mode 100644
index aed809a312..0000000000
--- a/executive-summary/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-core
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
deleted file mode 100644
index cd46827052..0000000000
--- a/executive-summary/ChangeLog
+++ /dev/null
@@ -1,226 +0,0 @@
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-services/Makefile.am: Clean the idl-generated files
-	properly.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c:
-	  component/e-summary-factory.c:
-	  component/e-summary-url.c: Warning's cleanup.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_rebuild_page): Requeue the redraw
-	if there is a selection on the widget.
-
-2000-11-01  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_display_window): Draw the window 
-	controls to move, close and configure the window.
-	(e_summary_window_move_(left|right|up|down)): Move the window around the
-	window list.
-
-	* component/e-summary-url.c (e_summary_url_click): Add handlers for the
-	window control URIs (close:// configure:// up:// down:// left:// and 
-	right://).
-	(get_protocol): Add support for the new protocols.
-	(parse_uri): Ditto.
-	(e_summary_url_describe): ditto.
-
-2000-10-30  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-factory.c (embed_service): Generate the uid here
-	and pass it into the create_view method.
-
-	* evolution-services/executive-summary-component-client.c
-	(executive_summary_component_client_create_view): Use the passed in UID
-	to generate a view.
-
-	* evolution-services/executive-summary-component.c
-	(impl_Evolution_SummaryComponent_create_view): Don't generate the id here
-	but use the passed in one instead.
-
-	* idl/SummaryComponent.idl: create_view now takes an ID parameter.
-
-2000-10-26  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (load_default): Neaten the Report bug link.
-	(e_summary_end_load): Put in a <hr> and a mailto to me.
-	(e_summary_new): Create an EvolutionShellClient from the Evolution_Shell.
-	(e_summary_get_shell_client): Retrieve the shell-client.
-
-	* component/e-summary-url.c (e_summary_url_click): On a PROTOCOL_VIEW
-	change the current view to the one specified in the URL. 
-
-2000-10-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/executive-summary/evolution-services' and
-	`-I$(top_srcdir)/executive-summary/evolution-services'.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary-url.c (e_summary_url_exec): Execute a program
-	specified in the format "exec://program args".
-	(e_summary_url_mail_compose): Run the mail composer when a mailto:
-	URL is clicked.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (e_summary_start_load): Add a hack to stop the
-	GtkHTML widget returning to the top when it is redrawn.
-
-	* component/e-summary-url.[ch]
-	* component/e-summary-util.[ch]: Split some functions out of e-summary.c
-
-	* component/Makefile.am: Added the new files, and run orbit-idl on the
-	mail composer idl.
-
-2000-10-25    <jpr@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): User 
-	bonobo_control_get_remote_uid_container, not the old version
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* test-service/main.c: Store each individual views data with the view.
-	Add comments to explain everything.
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Only try to create a 
-	control if the returned control != NULL.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary-component.c 
-	(impl_Evolution_SummaryComponent_create_view): Set the UID of the view 
-	before passing it to the create_view method.
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* idl/Summary.idl: Added set_icon method, and changed update_html_component
-	to update_component. Made all methods take a long ID instead of an
-	SummaryComponent.
-
-	* idl/SummaryComponent.idl: Combined the create_bonobo_view and 
-	create_html_view into create_view.
-	Added a destroy_view method.
-
-	* evolution-services/Makefile.am: Added the 2 new files.
-
-	* evolution-services/executive-summary-component-view.[ch]: New
-	files implementing a view of an ExecutiveSummaryComponent.
-
-	* evolution-services/executive-summary.[ch]
-	* evolution-services/executive-summary-client.[ch]
-	* evolution-services/executive-summary-component.[ch]
-	* evolution-services/executive-summary-component-client.[ch]:
-	* component/e-summary-factory.c
-	* component/e-summary.c
-	* test-service/main.c:
-	Updated to use new methods and the new ExecutiveSummaryComponentView
-	object.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/executive-summary.c (executive_summary_class_init):
-	Implement the update, set_title and flash functionality as signals
-	instead of methods.
-	(impl_Evolution_Summary_set_title): Emit signal.
-	(impl_Evolution_Summary_flash): Emit signal.
-	(impl_Evolution_Summary_update_html_component): Emit signal.
-	(executive_summary_new): Don't need the methods anymore.
-	(executive_summary_construct): Same.
-	(executive_summary_init): Remove the private initialisation.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* idl/Makefile.am (INCLUDES): 
-	* evolution-services/Makefile.am (INCLUDES): 
-	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* evolution-executive-summary.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* evolution-services/Makefile.am (IDLS): make the built sources
-	depend on the idl files
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added an icon parameter to the
-	create_view methods.
-
-	* evolution-services/executive-summary-component.c: Implement
-	the icon parameter.
-
-	* evolution-services/executive-summary-component-client.c: Ditto
-
-	* component/e-summary.c: Draw the specified icon.
-
-	* component/e-summary-factory.c: Use the icon parameter.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* evolution-services/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) to 
-	find gnomesupport.h
-
-2000-10-06  Iain Holmes  <iain@helixcode.com>
-
-	* component/e-summary.c (request_cb): Use gnome-vfs to retrieve
-	the requested files. Allows services to specify remote urls.
-	(load_default, e_summary_display_window, e_summary_rebuild_page): 
-	Change the html to match TigerT's lovely design.
-	(e_summary_add_html_service, e_summary_add_html_service): Add
-	the client argument so we can destroy it when we've quit.
-	(e_summary_window_update): Only do an update if there isn't one
-	pending.
-
-	* component/e-summary-factory.c (embed_service): upd.
-
-	* test-service/main.c: Made the test service be really silly and count
-	the number of seconds since it was started.
-
-2000-10-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* component/Makefile.am (INCLUDES): Fix builddir != srcdir.
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* widgets/.cvsignore: ignore more stuff.
-
-	* .cvsignore: ignore more stuff.
-
-	* idl/.cvsignore: ignore more stuff.
-
-	* evolution-services/.cvsignore: ignore more stuff.
-
-	* component/.cvsignore: ignore more stuff.
-
-	* .cvsignore: add Makefile
-
-2000-10-05  Chris Toshok  <toshok@helixcode.com>
-
-	* component/component-factory.c: include
-	<gal/widgets/e-gui-utils.h> instead of "e-util/e-gui-utils.h" to
-	clear up e_notice declaration, and #include <gnome.h> to get "_".
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* component/e-summary-factory.c (control_activate): upd.
-	(set_pixmap): upd. (update_pixmaps): upd.
-	(control_activate_cb): upd.
-	(control_deactivate): upd.
-
-2000-10-04  Iain Holmes  <iain@helixcode.com>
-
-	* idl/SummaryComponent.idl: Added a title argument to the 
-	create_view methods.
-
-2000-09-13  Iain Holmes  <iain@helixcode.com>
-
-	* Started the Executive Summary
diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/GNOME_Evolution_Summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am
deleted file mode 100644
index 3c14ed5593..0000000000
--- a/executive-summary/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS = idl widgets evolution-services component test-service
-
-oafdir = $(datadir)/oaf
-oaf_DATA = evolution-executive-summary.oafinfo
-
-EXTRA_DIST = $(oaf_DATA) 
diff --git a/executive-summary/component/.cvsignore b/executive-summary/component/.cvsignore
deleted file mode 100644
index 75f1a012f2..0000000000
--- a/executive-summary/component/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-core
-Makefile.in
-Makefile
-.deps
-.libs
-evolution-executive-summary
-Composer-common.c
-Composer.h
-Composer-stubs.c
-Composer-skels.c
\ No newline at end of file
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
deleted file mode 100644
index 5b3f147dfd..0000000000
--- a/executive-summary/component/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-bin_PROGRAMS =	evolution-executive-summary
-
-INCLUDES = \
-	-I$(top_srcdir)/widgets					\
-	-I$(top_srcdir)/widgets/e-text				\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/executive-summary			\
-	-I$(top_srcdir)/executive-summary			\
-	-I$(top_builddir)/executive-summary/evolution-services  \
-	-I$(top_srcdir)/executive-summary/evolution-services    \
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_VFS_CFLAGS)					\
-	$(UNICODE_CFLAGS)					\
-	$(GTKHTML_CFLAGS)					\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-CLEANFILES = $(COMPOSER_GENERATED)
-
-COMPOSER_GENERATED = \
-	Composer.h			\
-	Composer-common.c		\
-	Composer-skels.c		\
-	Composer-stubs.c
-
-Composer-impl.o: Composer.h
-
-$(COMPOSER_GENERATED):
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(top_srcdir)/composer/Composer.idl
-
-evolution_executive_summary_SOURCES =		\
-	$(COMPOSER_GENERATED)		\
-	component-factory.c		\
-	component-factory.h		\
-	e-summary.c			\
-	e-summary.h			\
-	e-summary-factory.c		\
-	e-summary-factory.h		\
-	e-summary-url.c			\
-	e-summary-url.h			\
-	e-summary-util.c		\
-	e-summary-util.h		\
-	main.c
-
-evolution_executive_summary_LDADD = 					\
-	$(top_builddir)/shell/libeshell.a		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(top_builddir)/executive-summary/widgets/libesummary-widgets.a	\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c
deleted file mode 100644
index 9af99c7e67..0000000000
--- a/executive-summary/component/component-factory.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include <gal/widgets/e-gui-utils.h>
-
-#include "component-factory.h"
-#include "e-summary-factory.h"
-
-#define COMPONENT_FACTORY_IID "OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-
-static BonoboGenericFactory *factory = NULL;
-static gint running_objects = 0;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-  { "executive-summary", "evolution-today.png" },
-  { NULL, NULL }
-};
-
-char *evolution_dir;
-
-/* EvolutionShellComponent methods and signals */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *folder_type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-  EvolutionShellClient *shell_client;
-  Evolution_Shell corba_shell;
-  BonoboControl *control;
-
-  if (g_strcasecmp (folder_type, "executive-summary") != 0)
-    return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-  shell_client = evolution_shell_component_get_owner (shell_component);
-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-  control = e_summary_factory_new_control (physical_uri, corba_shell);
-  if (!control)
-    return EVOLUTION_SHELL_COMPONENT_NOTFOUND;
-
-  *control_return = control;
-
-  return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-  Evolution_Shell corba_shell;
-
-  evolution_dir = g_strdup (evolution_homedir);
-
-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-  gtk_main_quit ();
-}
-
-static void
-factory_destroy (BonoboEmbeddable *embeddable,
-		 gpointer dummy)
-{
-  running_objects--;
-
-  if (running_objects > 0)
-    return;
-
-  if (factory)
-    bonobo_object_unref (BONOBO_OBJECT (factory));
-  else
-    g_warning ("Serious ref counting error");
-  factory = NULL;
-
-  gtk_main_quit ();
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-  EvolutionShellComponent *shell_component;
-
-  running_objects++;
-
-  shell_component = evolution_shell_component_new (folder_types,
-						   create_view,
-						   NULL,
-						   NULL,
-						   NULL,
-						   NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-		      GTK_SIGNAL_FUNC (factory_destroy), NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-		      GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-		      GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-  return BONOBO_OBJECT (shell_component);
-}
-
-void
-component_factory_init (void)
-{
-  if (factory != NULL)
-    return;
-
-  factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					factory_fn, NULL);
-
-  if (factory == NULL) {
-    e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
-	      _("Cannot initialize Evolution's Executive Summary component."));
-    exit (1);
-  }
-}
diff --git a/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h
deleted file mode 100644
index 65e4ad1d56..0000000000
--- a/executive-summary/component/component-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef COMPONENT_FACTORY_H
-#define COMPONENT_FACTORY_H
-
-void  component_factory_init  (void);
-
-#endif
-
-
diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c
deleted file mode 100644
index 79105c18a0..0000000000
--- a/executive-summary/component/e-summary-factory.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.c
- *
- * Authors: Ettore Perazzoli <ettore@helixcode.com>
- *          Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-control.h>
-
-#include <liboaf/liboaf.h>
-
-#include "gal/util/e-util.h"
-#include "e-util/e-gui-utils.h"
-
-#include "e-summary-factory.h"
-
-#include "e-summary.h"
-#include "Evolution.h"
-
-#include <evolution-services/executive-summary-component-client.h>
-#include <evolution-services/Executive-Summary.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-static GList *control_list = NULL;
-
-void embed_service (GtkWidget *widget,
-		    ESummary *esummary);
-
-BonoboUIVerb verbs[] = {
-	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),
-	BONOBO_UI_VERB_END
-};
-
-static void
-set_pixmap (BonoboUIComponent *component,
-	    const char        *xml_path,
-	    const char        *icon)
-{
-	char *path;
-	GdkPixbuf *pixbuf;
-
-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
-
-	pixbuf = gdk_pixbuf_new_from_file (path);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
-	gdk_pixbuf_unref (pixbuf);
-	g_free (path);
-}
-
-static void
-update_pixmaps (BonoboUIComponent *component)
-{
-	set_pixmap (component, "/Toolbar/AddService", "add-service.png");
-}
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *ui_component,
-		  ESummary          *esummary)
-{
-	Bonobo_UIContainer container;
-
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (ui_component, container);
-	bonobo_object_release_unref (container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);
-	
-	bonobo_ui_component_freeze (ui_component, NULL);
-
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
-			       "evolution-executive-summary.xml", 
-			       "evolution-executive-summary");
-
-	update_pixmaps (ui_component);
-	bonobo_ui_component_thaw (ui_component, NULL);
-}
-
-static void
-control_deactivate (BonoboControl     *control,
-		    BonoboUIComponent *ui_component,
-		    ESummary          *esummary)
-{
-	bonobo_ui_component_unset_container (ui_component);
-}
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	ESummary *summary;
-	BonoboUIComponent *ui_component;
-	Bonobo_ControlFrame control_frame;
-	Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	ui_component = bonobo_control_get_ui_component (control);
-	g_assert (ui_component != NULL);
-
-	if (gtk_object_get_data (GTK_OBJECT (control), "shell_view_interface") == NULL) {
-		control_frame = bonobo_control_get_control_frame (control);
-		if (control_frame == NULL) {
-			goto out;
-		}
-
-		CORBA_exception_init (&ev);
-		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-								      "IDL:Evolution/ShellView:1.0",
-								      &ev);
-		CORBA_exception_free (&ev);
-
-		if (shell_view_interface != CORBA_OBJECT_NIL) {
-			gtk_object_set_data (GTK_OBJECT (control),
-					     "shell_view_interface",
-					     shell_view_interface);
-		} else {
-			g_warning ("Control frame doesn't have Evolution/ShellView.");
-		}
-									       
-		summary = E_SUMMARY (user_data);
-		e_summary_set_shell_view_interface (summary, 
-						    shell_view_interface);
-	}
-
- out:
-	if (activate)
-		control_activate (control, ui_component, user_data);
-	else
-		control_deactivate (control, ui_component, user_data);
-}
-
-static void
-control_destroy_cb (BonoboControl *control,
-		    gpointer user_data)
-{
-	GtkWidget *esummary = user_data;
-
-	control_list = g_list_remove (control_list, control);
-
-	gtk_object_destroy (GTK_OBJECT (esummary));
-}
-
-static void 
-update (ExecutiveSummary *summary,
-	int id,
-	const char *html,
-	ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-
-	view = e_summary_view_from_id (esummary, id);
-	executive_summary_component_view_set_html (view, html);
-	e_summary_update_window (esummary, summary, html);
-}
-
-static void
-set_title (ExecutiveSummary *summary,
-	   int id,
-	   const char *title,
-	   ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-	
-	view = e_summary_view_from_id (esummary, id);
-	executive_summary_component_view_set_title (view, title);
-}
-
-static void
-flash (ExecutiveSummary *summary,
-       int id,
-       gpointer user_data)
-{
-	g_print ("FLASH!\n");
-}
-
-static void
-view_destroyed (ExecutiveSummaryComponentView *view,
-		ExecutiveSummaryComponentClient *client)
-{
-	int id;
-
-	g_print ("%s\n", __FUNCTION__);
-	id = executive_summary_component_view_get_id (view);
-	g_print ("%d\n", id);
-	executive_summary_component_client_destroy_view (client, view);
-}
-
-/* A ********very********
-   temporary function to embed something
-*/
-void
-embed_service (GtkWidget *widget,
-	       ESummary *esummary)
-{
-	char *required_interfaces[2] = {"IDL:Evolution:SummaryComponent:1.0",
-					NULL};
-	char *obj_id;
-	
-	obj_id = bonobo_selector_select_id ("Select a service",
-					    (const char **) required_interfaces);
-	if (obj_id == NULL)
-		return;
-
-	e_summary_factory_embed_service_from_id (esummary, obj_id);
-}
-
-void
-e_summary_factory_embed_service_from_id (ESummary *esummary,
-					 const char *obj_id)
-{
-	ExecutiveSummaryComponentClient *client;
-	ExecutiveSummary *summary;
-	ExecutiveSummaryComponentView *view;
-	int id;
-	
-	client = executive_summary_component_client_new (obj_id);
-	
-	g_return_if_fail (client != NULL);
-
-	/* Set the owner */
-	summary = EXECUTIVE_SUMMARY (executive_summary_new ());
-	executive_summary_component_client_set_owner (client, summary);
-	gtk_signal_connect (GTK_OBJECT (summary), "flash",
-			    GTK_SIGNAL_FUNC (flash), esummary);
-	gtk_signal_connect (GTK_OBJECT (summary), "set_title",
-			    GTK_SIGNAL_FUNC (set_title), esummary);
-	gtk_signal_connect (GTK_OBJECT (summary), "update",
-			    GTK_SIGNAL_FUNC (update), esummary);
-
-	/* Create view */
-	id = executive_summary_component_create_unique_id ();
-	view = executive_summary_component_client_create_view (client, id);
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroyed), client);
-
-	e_summary_add_service (esummary, summary, view, obj_id);
-	e_summary_rebuild_page (esummary);
-}
-
-BonoboControl *
-e_summary_factory_new_control (const char *uri,
-			       const Evolution_Shell shell)
-{
-  BonoboControl *control;
-  GtkWidget *esummary;
-
-  esummary = e_summary_new (shell);
-  if (esummary == NULL)
-    return NULL;
-
-  gtk_widget_show (esummary);
-
-  control = bonobo_control_new (esummary);
-
-  if (control == NULL) {
-    gtk_object_destroy (GTK_OBJECT (esummary));
-    return NULL;
-  }
-
-  gtk_signal_connect (GTK_OBJECT (control), "activate",
-		      control_activate_cb, esummary);
-
-  gtk_signal_connect (GTK_OBJECT (control), "destroy",
-		      control_destroy_cb, esummary);
-
-  control_list = g_list_prepend (control_list, control);
-
-  e_summary_rebuild_page (E_SUMMARY (esummary));
-  return control;
-}
diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h
deleted file mode 100644
index 175988a78c..0000000000
--- a/executive-summary/component/e-summary-factory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-factory.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_FACTORY_H__
-#define _E_SUMMARY_FACTORY_H__
-
-#include <Evolution.h>
-#include "e-summary.h"
-
-BonoboControl *e_summary_factory_new_control (const char *uri,
-					      const Evolution_Shell shell);
-void e_summary_factory_embed_service_from_id (ESummary *esummary,
-					      const char *obj_id);
-
-#endif
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
deleted file mode 100644
index c07a3efc99..0000000000
--- a/executive-summary/component/e-summary-url.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <bonobo.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "e-summary.h"
-#include "e-summary-url.h"
-#include "e-summary-util.h"
-
-#include <evolution-services/executive-summary-component-view.h>
-#include "Composer.h"
-
-typedef enum _ESummaryProtocol {
-	PROTOCOL_NONE,
-	PROTOCOL_HTTP,
-	PROTOCOL_MAILTO,
-	PROTOCOL_VIEW,
-	PROTOCOL_EXEC,
-	PROTOCOL_FILE,
-	PROTOCOL_CLOSE,
-	PROTOCOL_LEFT,
-	PROTOCOL_RIGHT,
-	PROTOCOL_UP,
-	PROTOCOL_DOWN,
-	PROTOCOL_CONFIGURE,
-	PROTOCOL_OTHER
-} ESummaryProtocol;
-
-static char *descriptions[] = {
-	N_("Open %s with the default GNOME application"),
-	N_("Open %s with the default GNOME web browser"),
-	N_("Send an email to %s"),
-	N_("Change the view to %s"),
-	N_("Run %s"),
-	N_("Open %s with the default GNOME application"),
-	N_("Close %s"),
-	N_("Move %s to the left"),
-	N_("Move %s to the right"),
-	N_("Move %s into the previous row"),
-	N_("Move %s into the next row"),
-	N_("Configure %s"),
-	N_("Open %s with the default GNOME application")
-};
-
-#define COMPOSER_IID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
-
-gboolean e_summary_url_mail_compose (ESummary *esummary,
-				     const char *url);
-gboolean e_summary_url_exec (const char *exec);
-
-void
-e_summary_url_request (GtkHTML *html,
-		       const gchar *url,
-		       GtkHTMLStream *stream)
-{
-	char *filename;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-
-	if (strncasecmp (url, "file:", 5) == 0) {
-		url += 5;
-		filename = e_pixmap_file (url);
-	} else if (strchr (url, ':') >= strchr (url, '/')) {
-		filename = e_pixmap_file (url);
-	} else
-		filename = g_strdup (url);
-
-	if (filename == NULL) {
-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		return;
-	}
-	
-	result = gnome_vfs_open (&handle, filename, GNOME_VFS_OPEN_READ);
-	
-	if (result != GNOME_VFS_OK) {
-		g_warning ("%s: %s", filename, 
-			   gnome_vfs_result_to_string (result));
-		g_free (filename);
-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		return;
-	}
-
-	g_free (filename);
-	while (1) {
-		char buffer[4096];
-		GnomeVFSFileSize size;
-
-		/* Clear buffer */
-		memset (buffer, 0x00, 4096);
-
-		result = gnome_vfs_read (handle, buffer, 4096, &size);
-		if (result != GNOME_VFS_OK && result != GNOME_VFS_ERROR_EOF) {
-			g_warning ("Error reading data: %s", 
-				   gnome_vfs_result_to_string (result));
-			gnome_vfs_close (handle);
-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);
-		}
-
-		if (size == 0)
-			break; /* EOF */
-
-		gtk_html_stream_write (stream, buffer, size);
-	}
-	
-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);
-	gnome_vfs_close (handle);
-}
-
-static char *
-parse_uri (const char *uri,
-	   ESummaryProtocol protocol,
-	   ESummary *esummary)
-{
-	ExecutiveSummaryComponentView *view;
-	char *parsed;
-	char *p;
-	int id;
-
-	switch (protocol) {
-		
-	case PROTOCOL_HTTP:
-		/* "http://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_EXEC:
-		/* "exec://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_VIEW:
-		/* "view://" == 7 */
-		parsed = g_strdup (uri + 7);
-		break;
-
-	case PROTOCOL_MAILTO:
-		/* Fun. Mailto's might be "mailto:" or "mailto://" */
-		if (strstr (uri, "mailto://") == NULL) {
-			parsed = (char *) (uri + 7);
-		} else {
-			parsed = (char *) (uri + 9);
-		}
-
-		/* Now strip anything after a question mark, 
-		   as it is a parameter (that we ignore for the time being) */
-		if ( (p = strchr (parsed, '?')) != NULL) {
-			parsed = g_strndup (parsed, p - parsed);
-		} else {
-			parsed = g_strdup (parsed);
-		}
-
-		break;
-
-	case PROTOCOL_CLOSE:
-		id = atoi (uri + 8);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_LEFT:
-		id = atoi (uri + 7);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_RIGHT:
-		id = atoi (uri + 8);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_UP:
-		id = atoi (uri + 5);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_DOWN:
-		id = atoi (uri + 7);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		id = atoi (uri + 12);
-		view = e_summary_view_from_id (esummary, id);
-		parsed = g_strdup (executive_summary_component_view_get_title (view));
-		break;
-
-	case PROTOCOL_NONE:
-	case PROTOCOL_OTHER:
-	default:
-		/* Just return the uneditted uri. */
-		parsed = g_strdup (uri);
-		break;
-	}
-
-	return parsed;
-}
-
-static ESummaryProtocol
-get_protocol (const char *url)
-{
-	char *lowerurl;
-	ESummaryProtocol protocol = PROTOCOL_OTHER;
-	
-	lowerurl = g_strdup (url);
-	g_strdown (lowerurl);
-	
-	/* Check for no :/ */
-	if (strstr (lowerurl, "://") == NULL) {
-		
-		/* Annoying alternative for mailto URLs */
-		if (strncmp (lowerurl, "mailto:", 6) != 0) {
-			g_free (lowerurl);
-			return PROTOCOL_NONE;
-		} else {
-			g_free (lowerurl);
-			return PROTOCOL_MAILTO;
-		}
-	}
-	
-	switch (lowerurl[0]) {
-	case 'c':
-		switch (lowerurl[1]) {
-		case 'l':
-			if (strncmp (lowerurl + 2, "ose", 3) == 0)
-				protocol = PROTOCOL_CLOSE;
-			break;
-		case 'o':
-			if (strncmp (lowerurl + 2, "nfigure", 7) == 0)
-				protocol = PROTOCOL_CONFIGURE;
-			break;
-		}
-
-	case 'd':
-		if (strncmp (lowerurl + 1, "own", 3) == 0)
-			protocol = PROTOCOL_DOWN;
-		break;
-
-	case 'e':
-		if (strncmp (lowerurl + 1, "xec", 3) == 0)
-			protocol = PROTOCOL_EXEC;
-		break;
-		
-	case 'f':
-		if (strncmp (lowerurl + 1, "ile", 3) == 0)
-			protocol = PROTOCOL_FILE;
-		break;
-
-	case 'h':
-		if (strncmp (lowerurl + 1, "ttp", 3) == 0)
-			protocol = PROTOCOL_HTTP;
-		break;
-		
-	case 'l':
-		if (strncmp (lowerurl + 1, "eft", 3) == 0)
-			protocol = PROTOCOL_LEFT;
-		break;
-
-	case 'm':
-		if (strncmp (lowerurl + 1, "ailto", 5) == 0)
-			protocol = PROTOCOL_MAILTO;
-		break;
-		
-	case 'r':
-		if (strncmp (lowerurl + 1, "ight", 4) == 0)
-			protocol = PROTOCOL_RIGHT;
-		break;
-
-	case 'u':
-		if (lowerurl[1] == 'p')
-			protocol = PROTOCOL_UP;
-		break;
-		
-	case 'v':
-		if (strncmp (lowerurl + 1, "iew", 3) == 0)
-			protocol = PROTOCOL_VIEW;
-		break;
-		
-	default:
-		break;
-	}
-	
-	g_free (lowerurl);
-	
-	return protocol;
-}
-
-void
-e_summary_url_click (GtkWidget *widget,
-		     const char *url,
-		     ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	ExecutiveSummaryComponentView *view;
-	gpointer window; /* FIXME */
-	char *parsed;
-	int id;
-
-	protocol = get_protocol (url);
-
-	parsed = parse_uri (url, protocol, esummary);
-
-	switch (protocol) {
-	case PROTOCOL_MAILTO:
-		/* Open a composer window */
-		e_summary_url_mail_compose (esummary, parsed);
-		break;
-		
-	case PROTOCOL_VIEW:
-		/* Change the EShellView's current uri */
-		e_summary_change_current_view (esummary, parsed);
-		break;
-		
-	case PROTOCOL_EXEC:
-		/* Execute the rest of the url */
-		e_summary_url_exec (parsed);
-		break;
-
-	case PROTOCOL_CLOSE:
-		/* Close the window. */
-		id = atoi (url + 8);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-		e_summary_window_remove_from_ht (window, esummary);
-		e_summary_window_free (window, esummary);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_CONFIGURE:
-		/* Configure the window. . . */
-		id = atoi (url + 12);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-	
-		/* Issue the configure command some how :) */
-		break;
-
-	case PROTOCOL_LEFT:
-		/* Window left */
-		id = atoi (url + 7);
-		view = e_summary_view_from_id (esummary, id);
-
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_left (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_RIGHT:
-		id = atoi (url + 8);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_right (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_UP:
-		id = atoi (url + 5);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_up (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_DOWN:
-		id = atoi (url + 7);
-		view = e_summary_view_from_id (esummary, id);
-		if (view == NULL)
-			return;
-
-		window = e_summary_window_from_view (esummary, view);
-
-		e_summary_window_move_down (esummary, window);
-		e_summary_rebuild_page (esummary);
-		break;
-
-	case PROTOCOL_NONE:
-	case PROTOCOL_OTHER:
-	case PROTOCOL_HTTP:
-	case PROTOCOL_FILE:
-	default:
-		/* Let browser handle it */
-		gnome_url_show (url);
-		break;
-		
-	}      
-
-	g_free (parsed);
-}
-
-gboolean
-e_summary_url_mail_compose (ESummary *esummary,
-			    const char *url)
-{
-	CORBA_Object composer;
-	CORBA_Environment ev;
-	Evolution_Composer_RecipientList *to, *cc, *bcc;
-	Evolution_Composer_Recipient *recipient;
-	char *address, *proto;
-	CORBA_char *subject;
-	
-	CORBA_exception_init (&ev);
-	
-	/* FIXME: Query for IIDs? */
-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Unable to start composer component!");
-		return FALSE;
-	}
-
-	if ( (proto = strstr (url, "://")) != NULL){
-		address = proto + 3;
-	} else {
-		if (strncmp (url, "mailto:", 7) == 0)
-			address = (char *) (url + 7);
-		else
-			address = (char *) url;
-	}
-
-	to = Evolution_Composer_RecipientList__alloc ();
-	to->_length = 1;
-	to->_maximum = 1;
-	to->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to->_maximum);
-	
-	recipient = to->_buffer;
-	recipient->name = CORBA_string_dup ("");
-	recipient->address = CORBA_string_dup (address?address:"");
-	
-	/* FIXME: Get these out of the URL */
-	cc = Evolution_Composer_RecipientList__alloc ();
-	cc->_length = 0;
-	cc->_maximum = 0;
-	cc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc->_maximum);
-	
-	bcc = Evolution_Composer_RecipientList__alloc ();
-	bcc->_length = 0;
-	bcc->_maximum = 0;
-	bcc->_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc->_maximum);
-	
-	subject = CORBA_string_dup ("");
-	
-	CORBA_exception_init (&ev);
-	Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		CORBA_free (to);
-		g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_free (to);
-	
-	CORBA_exception_init (&ev);  
-	Evolution_Composer_show (composer, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	/* FIXME: Free the composer? */
-	
-	return TRUE;
-}
-
-gboolean
-e_summary_url_exec (const char *exec)
-{
-	gchar **exec_array;
-	int argc;
-	
-	exec_array = g_strsplit (exec, " ", 0);
-	
-	argc = 0;
-	while (exec_array[argc] != NULL) {
-		argc++;
-	}
-	
-	gnome_execute_async (NULL, argc, exec_array);
-	
-	g_strfreev (exec_array);
-	return TRUE;
-}
-
-static char *
-e_summary_url_describe (const char *uri, 
-			ESummary *esummary)
-{
-	ESummaryProtocol protocol;
-	char *contents, *description;
-
-	protocol = get_protocol (uri);
-	contents = parse_uri (uri, protocol, esummary);
-
-	description = g_strdup_printf (_(descriptions[protocol]), contents);
-	g_free (contents);
-
-	return description;
-}
-
-void
-e_summary_url_over (GtkHTML *html,
-		    const char *uri,
-		    ESummary *esummary)
-{
-	char *description;
-
-	if (uri != NULL) {
-		description = e_summary_url_describe (uri, esummary);
-		e_summary_set_message (esummary, description, FALSE);
-		g_free (description);
-	} else {
-		e_summary_unset_message (esummary);
-	}
-}
diff --git a/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h
deleted file mode 100644
index 9844d384e0..0000000000
--- a/executive-summary/component/e-summary-url.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_URL_H__
-#define _E_SUMMARY_URL_H__
-
-void e_summary_url_request (GtkHTML *html,
-			    const gchar *url,
-			    GtkHTMLStream *stream);
-void e_summary_url_click (GtkWidget *widget,
-			  const char *url,
-			  ESummary *esummary);
-void e_summary_url_over (GtkHTML *html,
-			 const char *uri,
-			 ESummary *esummary);
-
-#endif
diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c
deleted file mode 100644
index 8ed8d4daea..0000000000
--- a/executive-summary/component/e-summary-util.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-url.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#include <gnome.h>
-
-char *
-e_pixmap_file (const char *filename)
-{
-	char *ret;
-	char *edir;
-
-	if (g_file_exists (filename)) {
-		ret = g_strdup (filename);
-
-		return ret;
-	}
-
-	/* Try the evolution images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-
-		return ret;
-	}
-
-	/* Try the evolution button images dir */
-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons",
-				      filename);
-
-	if (g_file_exists (edir)) {
-		ret = g_strdup (edir);
-		g_free (edir);
-		
-		return ret;
-	}
-
-	/* Fall back to the gnome_pixmap_file */
-	return gnome_pixmap_file (filename);
-}
-	
diff --git a/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h
deleted file mode 100644
index 0cfd50403a..0000000000
--- a/executive-summary/component/e-summary-util.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-util.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_UTIL_H__
-#define _E_SUMMARY_UTIL_H__
-
-char *e_pixmap_file (const char *filename);
-
-#endif
diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c
deleted file mode 100644
index dca8f98f0f..0000000000
--- a/executive-summary/component/e-summary.c
+++ /dev/null
@@ -1,813 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <bonobo.h>
-
-#include <gtkhtml/gtkhtml.h>
-#include <gtkhtml/gtkhtml-stream.h>
-#include <gal/util/e-util.h>
-
-#include "e-summary.h"
-#include "e-summary-factory.h"
-#include "e-summary-util.h"
-#include "e-summary-url.h"
-
-#define PARENT_TYPE (gtk_vbox_get_type ())
-
-/* From component-factory.c */
-extern char *evolution_dir;
-
-static GtkObjectClass *e_summary_parent_class;
-
-struct _ESummaryPrivate {
-	Evolution_Shell shell;
-	Evolution_ShellView shell_view_interface;
-
-	GtkWidget *html_scroller;
-	GtkWidget *html;
-
-	GHashTable *id_to_view;
-	GHashTable *view_to_window;
-	GHashTable *summary_to_window;
-	GList *window_list;
-
-	guint idle;
-
-	GtkHTMLStream *stream;
-	gboolean grabbed;
-};
-
-static gboolean on_object_requested (GtkHTML *html,
-				     GtkHTMLEmbedded *eb,
-				     ESummary *summary);
-static void e_summary_save_state (ESummary *esummary,
-				  const char *path);
-static void e_summary_load_state (ESummary *esummary,
-				  const char *path);
-		
-/* GtkObject methods */
-
-static void
-s2w_foreach (gpointer *key,
-	     gpointer *value,
-	     ESummary *esummary)
-{
-	e_summary_window_free ((ESummaryWindow *) value, esummary);
-	g_free (value);
-}
-
-static void
-e_summary_destroy (GtkObject *object)
-{
-	ESummary *esummary = E_SUMMARY (object);
-	ESummaryPrivate *priv;
-	char *prefix;
-
-	priv = esummary->private;
-	if (priv == NULL)
-		return;
-
-	prefix = g_concat_dir_and_file (evolution_dir, "config/Executive-Summary");
-	e_summary_save_state (esummary, prefix);
-	g_free (prefix);
-
-	g_hash_table_foreach (priv->summary_to_window, 
-			      (GHFunc) s2w_foreach, esummary);
-	g_hash_table_destroy (priv->summary_to_window);
-	g_hash_table_destroy (priv->id_to_view);
-	g_hash_table_destroy (priv->view_to_window);
-
-	g_free (esummary->private);
-	esummary->private = NULL;
-
-	e_summary_parent_class->destroy (object);
-}
-
-static void
-e_summary_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = e_summary_destroy;
-	
-	e_summary_parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_start_load (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *header = "<html><body bgcolor=\"#ffffff\">";
-
-	priv = summary->private;
-
-	priv->stream = gtk_html_begin (GTK_HTML (priv->html));
-
-	/* Hack to stop page returning to the top */
-	GTK_HTML (priv->html)->engine->newPage = FALSE;
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream,
-			header, strlen (header));
-}
-
-static void
-load_default (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *def = "<table width=\"100%\"><tr><td align=\"right\">"
-		"<img src=\"ccsplash.png\"></td></tr></table>"
-		"<table><tr><td><a href=\"exec://bug-buddy\"><img src=\"file://gnome-spider.png\" width=\"24\" height=\"24\" border=\"0\">"
-		"</a></td><td><a href=\"exec://bug-buddy\">Submit a bug report"
-		"</a></td></tr></table><hr>";
-
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (summary));
-
-	priv = summary->private;
-
-	g_return_if_fail (priv->stream != NULL);
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, def, strlen (def));
-}
-
-static void
-e_summary_end_load (ESummary *summary)
-{
-	ESummaryPrivate *priv;
-	char *footer = "<hr><p align=\"right\">All Executive Summary comments to <a href=\"mailto:iain@helixcode.com\">Iain Holmes (iain@helixcode.com)</a></p></body></html>";
-
-	priv = summary->private;
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, 
-			footer, strlen (footer));
-	gtk_html_end (GTK_HTML (priv->html), priv->stream, GTK_HTML_STREAM_OK);
-
-	priv->stream = NULL;
-}
-
-static void
-e_summary_init (ESummary *esummary)
-{
-	GdkColor bgcolour = {0, 0xdfff, 0xdfff, 0xffff};
-	ESummaryPrivate *priv;
-
-	esummary->private = g_new0 (ESummaryPrivate, 1);
-	priv = esummary->private;
-
-	priv->window_list = NULL;
-	priv->idle = 0;
-
-	/* HTML widget */
-	priv->html_scroller = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->html_scroller),
-					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	priv->html = gtk_html_new ();
-	gtk_html_set_editable (GTK_HTML (priv->html), FALSE);
-	gtk_html_set_default_background_color (GTK_HTML (priv->html), &bgcolour);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "url-requested",
-			    GTK_SIGNAL_FUNC (e_summary_url_request), esummary);
-  	gtk_signal_connect (GTK_OBJECT (priv->html), "object-requested", 
-  			    GTK_SIGNAL_FUNC (on_object_requested), esummary); 
-	gtk_signal_connect (GTK_OBJECT (priv->html), "link-clicked",
-			    GTK_SIGNAL_FUNC (e_summary_url_click), esummary);
-	gtk_signal_connect (GTK_OBJECT (priv->html), "on_url",
-			    GTK_SIGNAL_FUNC (e_summary_url_over), esummary);
-
-	gtk_container_add (GTK_CONTAINER (priv->html_scroller), priv->html);
-	gtk_widget_show_all (priv->html_scroller);
-
-	e_summary_rebuild_page (esummary);
-
-	/* Pack stuff */
-	gtk_box_pack_start (GTK_BOX (esummary), priv->html_scroller, 
-			    TRUE, TRUE, 0);
-
-	/* Init hashtables */
-	priv->summary_to_window = g_hash_table_new (NULL, NULL);
-	priv->id_to_view = g_hash_table_new (NULL, NULL);
-	priv->view_to_window = g_hash_table_new (NULL, NULL);
-}
-
-E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,
-	     e_summary_init, PARENT_TYPE);
-
-GtkWidget *
-e_summary_new (const Evolution_Shell shell)
-{
-	ESummary *esummary;
-	ESummaryPrivate *priv;
-	char *path;
-
-	esummary = gtk_type_new (e_summary_get_type ());
-	priv = esummary->private;
-
-	priv->shell = shell;
-
-	/* Restore services */
-	path = g_concat_dir_and_file (evolution_dir, 
-				      "config/Executive-Summary");
-	e_summary_load_state (esummary, path);
-	g_free (path);
-
-	return GTK_WIDGET (esummary);
-}
-
-static gboolean
-on_object_requested (GtkHTML *html,
-		     GtkHTMLEmbedded *eb,
-		     ESummary *summary)
-{
-	ESummaryWindow *window;
-	int type;
-
-	if (sscanf (eb->classid, "cid:%d-%p", &type, &window) != 2) {
-		g_warning ("Could not get the window reference\n");
-		return FALSE;
-	}
-
-	switch (type) {
-	case 1:
-		g_assert_not_reached ();
-		break;
-
-	case 2:
-		g_warning ("Bonobo services are not supported in this version.");
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return TRUE;
-}
-
-static void
-e_summary_display_window (ESummary *esummary,
-			  ESummaryWindow *window,
-			  int row,
-			  int col)
-{
-	ESummaryPrivate *priv;
-	char *footer = "</td></tr></table>";
-	char *title_html;
-	char *control_html;
-	char *colour[2] = {"e6e8e4", 
-			   "edeeeb"};
-	char *title_colour[2] = {"bac1b6", 
-				 "cdd1c7"};
-	const char *title, *icon, *html;
-	int id;
-
-	priv = esummary->private;
-
-	title = executive_summary_component_view_get_title (window->view);
-	icon = executive_summary_component_view_get_icon (window->view);
-	html = executive_summary_component_view_get_html (window->view);
-	id = executive_summary_component_view_get_id (window->view);
-
-	/** FIXME: Make this faster by caching it? */
-
-	control_html = g_strdup_printf 
-		("<table width=\"32\" height=\"48\"><tr><td>"
-		 "<a href=\"close://%d\"><img border=\"0\" src=\"service-close.png\"></a></td>"
-		 "<td><a href=\"configure://%d\"><img border=\"0\" src=\"service-configure.png\"></a></td></tr>"
-		 "<tr><td><a href=\"left://%d\"><img border=\"0\" src=\"service-left.png\"></a></td>"
-		 "<td><a href=\"right://%d\"><img border=\"0\" src=\"service-right.png\"></a></td></tr>"
-		 "<tr><td><a href=\"down://%d\"><img border=\"0\" src=\"service-down.png\"></a></td>"
-		 "<td><a href=\"up://%d\"><img border=\"0\" src=\"service-up.png\"></a></td></tr></table>", id, id, id, id, id, id);
-	
-	title_html = g_strdup_printf ("<table cellspacing=\"0\" "
-				      "cellpadding=\"0\" border=\"0\" width=\"100%%\" height=\"100%%\">"
-				      "<tr><td bgcolor=\"#%s\">"
-				      "<table width=\"100%%\"><tr><td>"
-				      "<img src=\"%s\"></td>"
-				      "<td nowrap align=\"center\" width=\"100%%\">"
-				      "<b>%s</b></td><td>%s</td></tr></table></td></tr><tr>"
-				      "<td bgcolor=\"#%s\" height=\"100%%\">",
-				      title_colour[col % 2], icon, title,
-				      control_html, colour[col % 2]);
-	g_free (control_html);
-	
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, title_html,
-			strlen (title_html));
-	g_free (title_html);
-	
-	if (html != NULL && *html != '\0') {
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				html, strlen (html));
-	} else {
-		g_warning ("Bonobo executive summary components are not supported at this time.");
-#if 0
-		body_cid = g_strdup_printf ("<object classid=\"cid:2-%p\"></object>", window);
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				body_cid, strlen (body_cid));
-#endif
-	}
-
-	gtk_html_write (GTK_HTML (priv->html), priv->stream,
-			footer, strlen (footer));
-}
-
-int
-e_summary_rebuild_page (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	GList *windows;
-	char *service_table = "<table numcols=\"3\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" height=\"100%\">";
-	int loc;
-
-	g_return_val_if_fail (esummary != NULL, FALSE);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE);
-
-	priv = esummary->private;
-
-	/* If there is a selection, don't redraw the page so that the selection
-	   isn't cleared */
-	if (GTK_HTML (priv->html)->in_selection == TRUE ||
-	    GTK_HTML (priv->html)->engine->active_selection == TRUE)
-		return TRUE;
-
-	gtk_layout_freeze (GTK_LAYOUT (priv->html));
-	e_summary_start_load (esummary);
-	load_default (esummary);
-
-	/* Load the start of the services */
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, service_table,
-			strlen (service_table));
-	/* Load each of the services */
-	loc = 0;
-	for (windows = priv->window_list; windows; windows = windows->next) {
-		ESummaryWindow *window;
-		char *td = "<td height=\"100%\" width=\"33%\" valign=\"top\">";
-		
-		window = windows->data;
-
-		if (loc % 3 == 0) {
-			if (loc != 0) {
-				gtk_html_write (GTK_HTML (priv->html),
-						priv->stream, "</tr>", 5);
-			}
-			gtk_html_write (GTK_HTML (priv->html),
-					priv->stream, "<tr height=\"100%\">", 18);
-		}
-
-		gtk_html_write (GTK_HTML (priv->html), priv->stream,
-				td, strlen (td));
-
-		e_summary_display_window (esummary, window, 
-					  (loc / 3), (loc % 3));
-
-		gtk_html_write (GTK_HTML (priv->html), priv->stream, "</td>", 5);
-		loc++;
-	}
-				
-	gtk_html_write (GTK_HTML (priv->html), priv->stream, "</tr></table>",
-			13);
-	e_summary_end_load (esummary);
-	gtk_layout_thaw (GTK_LAYOUT (priv->html));
-
-	priv->idle = 0;
-	return FALSE;
-}
-
-void
-e_summary_add_service (ESummary *esummary,
-		       ExecutiveSummary *summary,
-		       ExecutiveSummaryComponentView *view,
-		       const char *iid)     
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-	int id;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	window = g_new0 (ESummaryWindow, 1);
-	window->summary = summary;
-	window->iid = g_strdup (iid);
-	window->view = view;
-
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-	
-	id = executive_summary_component_view_get_id (view);
-	g_hash_table_insert (priv->id_to_view, GINT_TO_POINTER (id), view);
-	g_hash_table_insert (priv->view_to_window, view, window);
-}
-
-#if 0
-void
-e_summary_add_html_service (ESummary *esummary,
-			    ExecutiveSummary *summary,
-			    ExecutiveSummaryComponentClient *client,
-			    const char *html,
-			    const char *title,
-			    const char *icon)
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-
-	window = g_new0 (ESummaryWindow, 1);
-	window->type = E_SUMMARY_WINDOW_HTML;
-	window->html = g_strdup (html);
-	window->title = g_strdup (title);
-	window->icon = icon ? g_strdup (icon) : NULL;
-	window->client = client;
-
-	window->summary = summary;
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-}
-
-void
-e_summary_add_bonobo_service (ESummary *esummary,
-			      ExecutiveSummary *summary,
-			      ExecutiveSummaryComponentClient *client,
-			      GtkWidget *control,
-			      const char *title,
-			      const char *icon)
-{
-	ESummaryWindow *window;
-	ESummaryPrivate *priv;
-	
-	window = g_new0 (ESummaryWindow, 1);
-	window->type = E_SUMMARY_WINDOW_BONOBO;
-	window->control = control;
-
-	window->client = client;
-
-	window->title = g_strdup (title);
-	window->summary = summary;
-	window->icon = icon ? g_strdup (icon): NULL;
-
-	priv = esummary->private;
-	priv->window_list = g_list_append (priv->window_list, window);
-
-	g_hash_table_insert (priv->summary_to_window, summary, window);
-}
-#endif
-
-void
-e_summary_window_free (ESummaryWindow *window,
-		       ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (window != NULL);
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-	g_free (window->iid);
-
-	priv->window_list = g_list_remove (priv->window_list, window);
-
-	bonobo_object_unref (BONOBO_OBJECT (window->summary));
-	gtk_object_unref (GTK_OBJECT (window->view));
-}
-
-/* Call this before e_summary_window_free, execpt when you are freeing
-   the hash table */
-void
-e_summary_window_remove_from_ht (ESummaryWindow *window,
-				 ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-
-	priv = esummary->private;
-	g_hash_table_remove (priv->summary_to_window, window->summary);
-}
-
-void
-e_summary_update_window (ESummary *esummary,
-			 ExecutiveSummary *summary,
-			 const char *html)
-{
-	ESummaryPrivate *priv;
-	
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-	g_return_if_fail (summary != NULL);
-	
-	priv = esummary->private;
-	
-	if (priv->idle != 0)
-		return;
-	
-	priv->idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);
-}
-
-ExecutiveSummaryComponentView *
-e_summary_view_from_id (ESummary *esummary,
-			int id)
-{
-	ESummaryPrivate *priv;
-	ExecutiveSummaryComponentView *view;
-
-	g_return_val_if_fail (esummary != NULL, NULL);
-	g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL);
-	g_return_val_if_fail (id > 0, NULL);
-
-	priv = esummary->private;
-	view = g_hash_table_lookup (priv->id_to_view, GINT_TO_POINTER (id));
-
-	return view;
-}
-
-void
-e_summary_set_shell_view_interface (ESummary *summary,
-				    Evolution_ShellView svi)
-{
-	ESummaryPrivate *priv;
-
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (summary));
-	g_return_if_fail (svi != CORBA_OBJECT_NIL);
-
-	priv = summary->private;
-	priv->shell_view_interface = svi;
-}
-
-/* Wrappers for Evolution_ShellView */
-void
-e_summary_set_message (ESummary *esummary,
-		       const char *message,
-		       gboolean busy)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	if (message != NULL)
-		Evolution_ShellView_set_message (svi, message, busy, &ev);
-	else 
-		Evolution_ShellView_set_message (svi, "", busy, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_unset_message (ESummary *esummary)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_unset_message (svi, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_change_current_view (ESummary *esummary,
-			       const char *uri)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_change_current_view (svi, uri, &ev);
-	CORBA_exception_free (&ev);
-}
-
-void
-e_summary_set_title (ESummary *esummary,
-		     const char *title)
-{
-	ESummaryPrivate *priv;
-	Evolution_ShellView svi;
-	CORBA_Environment ev;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	priv = esummary->private;
-
-	svi = priv->shell_view_interface;
-	if (svi == NULL)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_ShellView_set_title (svi, title, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void
-e_summary_load_state (ESummary *esummary,
-		      const char *path)
-{
-	char *fullpath;
-	char **argv;
-	int argc, i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	fullpath = g_strdup_printf ("=%s=/services/iids", path);
-	gnome_config_get_vector (fullpath, &argc, &argv);
-
-	for (i = 0; i < argc; i++) {
-		e_summary_factory_embed_service_from_id (esummary, argv[i]);
-	}
-	
-	g_free (argv);
-	g_free (fullpath);
-}
-
-static void
-e_summary_save_state (ESummary *esummary,
-		      const char *path)
-{
-	ESummaryPrivate *priv;
-	GList *windows;
-	char *fullpath;
-	char **argv;
-	int argc, i;
-
-	g_return_if_fail (esummary != NULL);
-	g_return_if_fail (IS_E_SUMMARY (esummary));
-
-	fullpath = g_strdup_printf("=%s=/services/iids", path);
-	priv = esummary->private;
-
-	argc = g_list_length (priv->window_list);
-	argv = g_new (char *, argc);
-
-	for (windows = priv->window_list, i = 0; windows; 
-	     windows = windows->next, i++) {
-		ESummaryWindow *window;
-
-		window = windows->data;
-		g_print ("%s: IID: %s\n", path, window->iid);
-		argv[i] = window->iid;
-	}
-
-	gnome_config_set_vector (fullpath, argc, (const char **)argv);
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-
-	g_free (fullpath);
-	g_free (argv);
-}
-
-ESummaryWindow *
-e_summary_window_from_view (ESummary *esummary,
-			    ExecutiveSummaryComponentView *view)
-{
-	ESummaryPrivate *priv;
-
-	priv = esummary->private;
-	return g_hash_table_lookup (priv->view_to_window, view);
-}
-
-void
-e_summary_window_move_left (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *grandparent;
-	int position;
-
-	priv = esummary->private;
-
-	/* Need to cache this location */
-	win_item = g_list_find (priv->window_list, window);
-	
-	/* Find the item 2 previous. */
-	if (win_item->prev == NULL)
-		return; /* Item was first, can't be moved left */
-
-	grandparent = win_item->prev->prev;
-
-	/* Remove it from the list */
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	/* Insert it after the grandparent */
-	position = g_list_position (priv->window_list, grandparent);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_right (ESummary *esummary,
-			     ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item, *child;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	if (win_item->next == NULL)
-		return;
-
-	child = win_item->next;
-	
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-	
-	position = g_list_position (priv->window_list, child);
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 1);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_up (ESummary *esummary,
-			  ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-	
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position - 3);
-	g_list_free_1 (win_item);
-}
-
-void
-e_summary_window_move_down (ESummary *esummary,
-			    ESummaryWindow *window)
-{
-	ESummaryPrivate *priv;
-	GList *win_item;
-	int position;
-
-	priv = esummary->private;
-
-	win_item = g_list_find (priv->window_list, window);
-
-	position = g_list_position (priv->window_list, win_item);
-	priv->window_list = g_list_remove_link (priv->window_list, win_item);
-
-	priv->window_list = g_list_insert (priv->window_list, win_item->data,
-					   position + 3);
-}
diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h
deleted file mode 100644
index f68575d76c..0000000000
--- a/executive-summary/component/e-summary.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_H__
-#define _E_SUMMARY_H__
-
-#include <gtk/gtksignal.h>
-#include <gtkhtml/gtkhtml.h>
-#include <gtk/gtkvbox.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component-client.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#include <Evolution.h>
-
-#define E_SUMMARY_TYPE (e_summary_get_type ())
-#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary))
-#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass))
-#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE))
-#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE))
-
-typedef struct _ESummaryPrivate ESummaryPrivate;
-typedef struct _ESummary ESummary;
-typedef struct _ESummaryClass ESummaryClass;
-typedef struct _ESummaryWindow ESummaryWindow;
-
-struct _ESummaryWindow {
-	ExecutiveSummary *summary;
-	ExecutiveSummaryComponentView *view;
-	char *iid;
-};
-
-struct _ESummary {
-  GtkVBox parent;
-
-  ESummaryPrivate *private;
-};
-
-struct _ESummaryClass {
-  GtkVBoxClass parent_class;
-};
-
-GtkType e_summary_get_type (void);
-GtkWidget *e_summary_new (const Evolution_Shell shell);
-int e_summary_rebuild_page (ESummary *esummary);
-void e_summary_add_html_service (ESummary *esummary,
-				 ExecutiveSummary *summary,
-				 ExecutiveSummaryComponentClient *client,
-				 const char *html,
-				 const char *title,
-				 const char *icon);
-void e_summary_add_bonobo_service (ESummary *esummary,
-				   ExecutiveSummary *summary,
-				   ExecutiveSummaryComponentClient *client,
-				   GtkWidget *control,
-				   const char *title,
-				   const char *icon);
-void e_summary_update_window (ESummary *esummary,
-			      ExecutiveSummary *summary,
-			      const char *html);
-void e_summary_window_free (ESummaryWindow *window,
-			    ESummary *esummary);
-void  e_summary_window_remove_from_ht (ESummaryWindow *window,
-				       ESummary *esummary);
-void e_summary_add_service (ESummary *esummary,
-			    ExecutiveSummary *summary,
-			    ExecutiveSummaryComponentView *view,
-			    const char *iid);
-ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,
-							int id);
-void e_summary_set_shell_view_interface (ESummary *summary,
-					 Evolution_ShellView svi);
-void e_summary_set_message (ESummary *esummary,
-			    const char *message,
-			    gboolean busy);
-void e_summary_unset_message (ESummary *esummary);
-void e_summary_change_current_view (ESummary *esummary,
-				    const char *uri);
-void e_summary_set_title (ESummary *esummary,
-			  const char *title);
-ESummaryWindow *e_summary_window_from_view (ESummary *esummary,
-					    ExecutiveSummaryComponentView *view);
-void e_summary_window_move_left (ESummary *esummary,
-				 ESummaryWindow *window);
-void e_summary_window_move_right (ESummary *esummary,
-				  ESummaryWindow *window);
-void e_summary_window_move_up (ESummary *esummary,
-			       ESummaryWindow *window);
-void e_summary_window_move_down (ESummary *esummary,
-				 ESummaryWindow *window);
-
-#endif
diff --git a/executive-summary/component/executive-summary.png b/executive-summary/component/executive-summary.png
deleted file mode 100644
index 10a122f39e..0000000000
--- a/executive-summary/component/executive-summary.png
+++ /dev/null
diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c
deleted file mode 100644
index 9c331ce813..0000000000
--- a/executive-summary/component/main.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* 
- * main.c: The core of the executive summary component.
- *
- * Copyright (C) 2000 Helix Code, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- *
- * Author: Iain Holmes  <iain@helixcode.com>
- */
-
-#include <config.h>
-
-#include <signal.h>
-
-#include <gnome.h>
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object-directory.h>
-#include <liboaf/liboaf.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include "gal/widgets/e-gui-utils.h"
-#include "gal/widgets/e-cursors.h"
-#include "gal/widgets/e-unicode.h"
-
-#include <libgnomevfs/gnome-vfs.h>
-#include "component-factory.h"
-
-int
-main (int argc,
-      char **argv)
-{
-  CORBA_ORB orb;
-
-#ifdef ENABLE_NLS
-  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-  textdomain (PACKAGE);
-#endif
-
-  gnome_init_with_popt_table ("evolution-executive-summary", VERSION,
-			      argc, argv, oaf_popt_options, 0, NULL);
-  orb = oaf_init (argc, argv);
-
-  gdk_rgb_init ();
-  if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-    g_error (_("Executive summary component could not initialize Bonobo.\n"
-	       "If there was a warning message about the "
-	       "RootPOA, it probably means\nyou compiled "
-	       "Bonobo against GOAD instead of OAF."));
-  }
-
-#ifdef GTKHTML_HAVE_GCONF
-  gconf_init (argc, argv, NULL);
-#endif
-
-  e_unicode_init ();
-
-  e_cursors_init ();
-
-  component_factory_init ();
-
-  signal (SIGSEGV, SIG_DFL);
-  signal (SIGBUS, SIG_DFL);
-
-  gnome_vfs_init ();
-  bonobo_main ();
-
-  return 0;
-}
diff --git a/executive-summary/default-header.html b/executive-summary/default-header.html
deleted file mode 100644
index 64fc119ea6..0000000000
--- a/executive-summary/default-header.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>Evolution - Executive Summary</title>
-</head>
-
-<body bgcolor="#ffffff">
-<table>
-<tr valign="center">
-<td align="right"><img src="executive-summary.png"></td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo
deleted file mode 100644
index fe39e4e631..0000000000
--- a/executive-summary/evolution-executive-summary.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"
-	type="exe"
-	location="evolution-executive-summary">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string" 
-		value="Factory for the Evolution executive summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"
-	type="factory"
-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		value="Evolution component for the executive summary."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-today.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/evolution-services/.cvsignore b/executive-summary/evolution-services/.cvsignore
deleted file mode 100644
index d9807cd94f..0000000000
--- a/executive-summary/evolution-services/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Executive-Summary.h
-Executive-Summary-common.c
-Executive-Summary-skels.c
-Executive-Summary-stubs.c
-Makefile.in
-Makefile
-core
-.deps
-.libs
-*.lo
-*.la
\ No newline at end of file
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
deleted file mode 100644
index 09b19f6bc9..0000000000
--- a/executive-summary/evolution-services/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-lib_LTLIBRARIES = libevolution-services.la
-
-INCLUDES = \
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/executive-summary		\
-	-I$(top_builddir)/executive-summary		\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-services\"
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
-Executive-Summary-impl.o: Executive-Summary.h
-
-IDLS = \
-	$(srcdir)/../idl/Executive-Summary.idl		\
-	$(srcdir)/../idl/Summary.idl			\
-	$(srcdir)/../idl/SummaryComponent.idl
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \
-		-I$(srcdir) $(srcdir)/../idl/Executive-Summary.idl
-
-libevolution_services_la_SOURCES =		\
-	$(IDL_GENERATED)		\
-	executive-summary.c		\
-	executive-summary.h		\
-	executive-summary-client.c	\
-	executive-summary-client.h	\
-	executive-summary-component.c	\
-	executive-summary-component.h	\
-	executive-summary-component-client.c	\
-	executive-summary-component-client.h	\
-	executive-summary-component-view.c	\
-	executive-summary-component-view.h
-
-libevolution_services_la_LIBADD = 					\
-	$(top_builddir)/e-util/libeutil.la		\
-	$(BONOBO_VFS_GNOME_LIBS)			\
-	$(EXTRA_GNOME_LIBS)				\
-	$(GTKHTML_LIBS)					\
-	$(UNICODE_LIBS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES   += $(BUILT_SOURCES)
diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c
deleted file mode 100644
index 88796d1753..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary-client.h"
-#include "executive-summary-component.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryClient *client;
-	ExecutiveSummaryClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_client_init (ExecutiveSummaryClient *client)
-{
-	ExecutiveSummaryClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_client_class_init (ExecutiveSummaryClientClass *client)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (client);
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	object_class->destroy = executive_summary_client_destroy;
-}
-
-void
-executive_summary_client_construct (ExecutiveSummaryClient *client,
-				    CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-E_MAKE_TYPE (executive_summary_client, "ExecutiveSummaryClient",
-	     ExecutiveSummaryClient, executive_summary_client_class_init,
-	     executive_summary_client_init, PARENT_TYPE);
-
-void
-executive_summary_client_set_title (ExecutiveSummaryClient *client,
-				    int id,
-				    const char *title)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_set_title (summary, id, title, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-				   int id,
-				   const char *icon)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_set_icon (summary, id, icon, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&ev));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_flash (ExecutiveSummaryClient *client,
-				int id)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_flash (summary, id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error flashing");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-executive_summary_client_update (ExecutiveSummaryClient *client,
-				 int id,
-				 const char *html)
-{
-	Evolution_Summary summary;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_Summary_update_component (summary, id, html, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error updating the component");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-		
diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h
deleted file mode 100644
index c6c138dd69..0000000000
--- a/executive-summary/evolution-services/executive-summary-client.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())
-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))
-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))
-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryClientPrivate ExecutiveSummaryClientPrivate;
-typedef struct _ExecutiveSummaryClient ExecutiveSummaryClient;
-typedef struct _ExecutiveSummaryClientClass ExecutiveSummaryClientClass;
-
-struct _ExecutiveSummaryClient {
-	BonoboObjectClient parent;
-	
-	ExecutiveSummaryClientPrivate *private;
-};
-
-struct _ExecutiveSummaryClientClass {
-	BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_client_get_type (void);
-void executive_summary_client_construct (ExecutiveSummaryClient *client,
-					 CORBA_Object object);
-void executive_summary_client_set_title (ExecutiveSummaryClient *client,
-					 int id,
-					 const char *title);
-void executive_summary_client_set_icon (ExecutiveSummaryClient *client,
-					int id,
-					const char *icon);
-void executive_summary_client_flash (ExecutiveSummaryClient *client,
-				     int id);
-void executive_summary_client_update (ExecutiveSummaryClient *client,
-				      int id,
-				      const char *html);
-
-#endif
diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c
deleted file mode 100644
index ecd806af52..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <liboaf/liboaf.h>
-
-#include <Executive-Summary.h>
-#include "executive-summary-component-client.h"
-#include "executive-summary-component-view.h"
-#include "executive-summary.h"
-
-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ExecutiveSummaryComponentClientPrivate {
-	int dummy;
-};
-
-static void
-executive_summary_component_client_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentClient *client;
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	client = EXECUTIVE_SUMMARY_COMPONENT_CLIENT (object);
-	priv = client->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	client->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_client_init (ExecutiveSummaryComponentClient *client)
-{
-	ExecutiveSummaryComponentClientPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentClientPrivate, 1);
-	client->private = priv;
-}
-
-static void
-executive_summary_component_client_class_init (ExecutiveSummaryComponentClientClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_client_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-void
-executive_summary_component_client_construct (ExecutiveSummaryComponentClient *client,
-					      CORBA_Object corba_object)
-{
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);
-}
-
-ExecutiveSummaryComponentClient*
-executive_summary_component_client_new (const char *id)
-{
-	ExecutiveSummaryComponentClient *client;
-	CORBA_Environment ev;
-	CORBA_Object corba_object;
-	
-	g_return_val_if_fail (id != NULL, NULL);
-	
-	CORBA_exception_init (&ev);
-	
-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-		g_warning ("Could not start %s\n", id);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	if (corba_object == CORBA_OBJECT_NIL) {
-		g_warning ("Could not activate %s\n", id);
-		return NULL;
-	}
-	
-	client = gtk_type_new (executive_summary_component_client_get_type ());
-	executive_summary_component_client_construct (client, corba_object);
-	
-	return client;
-}
-
-/* External API */
-void
-executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-					      ExecutiveSummary *summary)
-{
-	Evolution_SummaryComponent component;
-	Evolution_Summary corba_object;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (summary != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));
-
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	Evolution_SummaryComponent_set_owner (component, corba_object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error setting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-void
-executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	
-	Evolution_SummaryComponent_unset_owner (component, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error unsetting owner");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-
-#if 0
-void
-executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,
-					     gboolean *bonobo,
-					     gboolean *html)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	Evolution_SummaryComponent_supports (component, bonobo, html, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error checking supports");
-	}
-
-	CORBA_exception_free (&ev);
-	return;
-}
-#endif
-
-ExecutiveSummaryComponentView *
-executive_summary_component_client_create_view (ExecutiveSummaryComponentClient *client,
-						int id)
-{
-	ExecutiveSummaryComponentView *view;
-	Evolution_SummaryComponent component;
-	char *html, *title, *icon;
-	Bonobo_Control control;
-	BonoboControl *bc;
-	int ret_id;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),
-			      NULL);
-	
-	CORBA_exception_init (&ev);
-	if (client)
-		component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	/* Get all the details about the view */
-	g_print ("In %s\n", __FUNCTION__);
-	ret_id = Evolution_SummaryComponent_create_view (component, id, &control, 
-							 &html, &title, &icon, &ev);
-	g_print ("Out %s\n", __FUNCTION__);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error creating view");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/* Create a local copy of the remote view */
-	if (control != CORBA_OBJECT_NIL) {
-		bc = BONOBO_CONTROL (bonobo_widget_new_control_from_objref (control, NULL));
-	} else {
-		bc = NULL;
-	}
-
-	view = executive_summary_component_view_new (NULL, bc, html, title,
-						     icon);
-	executive_summary_component_view_set_id (view, ret_id);
-	
-	return view;
-}
-
-#if 0
-char *
-executive_summary_component_client_create_html_view (ExecutiveSummaryComponentClient *client,
-						     char **title,
-						     char **icon)
-{
-	CORBA_char *ret_html;
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),
-			      NULL);
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-
-	ret_html = Evolution_SummaryComponent_create_html_view (component, title, icon, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error creating HTML view");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return (char *)g_strdup (ret_html);
-}
-#endif
-
-void
-executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client)
-{
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_configure (component, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error configuring service");
-		bonobo_object_unref (BONOBO_OBJECT (client));
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-	
-	return;
-}
-
-void
-executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,
-						 ExecutiveSummaryComponentView *view) 
-{
-	int id;
-	Evolution_SummaryComponent component;
-	CORBA_Environment ev;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	id = executive_summary_component_view_get_id (view);
-
-	CORBA_exception_init (&ev);
-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));
-	Evolution_SummaryComponent_destroy_view (component, id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error destroying view #%d", id);
-	}
-
-	CORBA_exception_free (&ev);
-
-	return;
-}
-
-E_MAKE_TYPE (executive_summary_component_client, 
-	     "ExecutiveSummaryComponentClient", 
-	     ExecutiveSummaryComponentClient,
-	     executive_summary_component_client_class_init,
-	     executive_summary_component_client_init, PARENT_TYPE)
diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h
deleted file mode 100644
index 3a9edd7a1c..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-client.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component-client.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__
-
-#include <bonobo.h>
-#include <evolution-services/executive-summary.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentClientPrivate ExecutiveSummaryComponentClientPrivate;
-typedef struct _ExecutiveSummaryComponentClient ExecutiveSummaryComponentClient;
-typedef struct _ExecutiveSummaryComponentClientClass ExecutiveSummaryComponentClientClass;
-
-struct _ExecutiveSummaryComponentClient {
-  BonoboObjectClient parent;
-
-  ExecutiveSummaryComponentClientPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClientClass {
-  BonoboObjectClientClass parent_class;
-};
-
-GtkType executive_summary_component_client_get_type (void);
-ExecutiveSummaryComponentClient *executive_summary_component_client_new (const char *id);
-
-void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,
-						   ExecutiveSummary *summary);
-void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client);
-
-void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,
-						  gboolean *bonobo,
-						  gboolean *html);
-
-void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client);
-void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,
-						      ExecutiveSummaryComponentView *view);
-
-#endif
-
diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c
deleted file mode 100644
index ebcbeb9e09..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-struct _ExecutiveSummaryComponentViewPrivate {
-	ExecutiveSummaryComponent *component;
-
-	BonoboControl *control;
-	char *html;
-	
-	char *title;
-	char *icon;
-	
-	int id;
-};
-
-static GtkObjectClass *parent_class = NULL;
-#define PARENT_TYPE (gtk_object_get_type ())
-
-static void
-executive_summary_component_view_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponentView *view;
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	view = EXECUTIVE_SUMMARY_COMPONENT_VIEW (object);
-	priv = view->private;
-	if (priv == NULL)
-		return;
-
-	if (priv->component)
-		bonobo_object_unref (BONOBO_OBJECT (priv->component));
-
-	if (priv->control)
-		bonobo_object_unref (BONOBO_OBJECT (priv->control));
-
-	g_free (priv->html);
-	g_free (priv->title);
-	g_free (priv->icon);
-
-	g_free (priv);
-	view->private = NULL;
-
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-executive_summary_component_view_class_init (ExecutiveSummaryComponentViewClass *view_class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (view_class);
-
-	object_class->destroy = executive_summary_component_view_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-executive_summary_component_view_init (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryComponentViewPrivate, 1);
-	view->private = priv;
-
-	priv->control = NULL;
-	priv->html = NULL;
-	priv->title = NULL;
-	priv->icon = NULL;
-	priv->id = -1;
-}
-
-E_MAKE_TYPE (executive_summary_component_view, "ExecutiveSummaryComponentView",
-	     ExecutiveSummaryComponentView, 
-	     executive_summary_component_view_class_init,
-	     executive_summary_component_view_init, PARENT_TYPE);
-
-void
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	g_return_if_fail (control != NULL || html != NULL);
-	
-	priv = view->private;
-
-	if (component != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (component));
-		priv->component = component;
-	} else {
-		priv->component = NULL;
-	}
-
-	if (control != NULL) {
-		bonobo_object_ref (BONOBO_OBJECT (control));
-		priv->control = control;
-	} else {
-		priv->control = NULL;
-	}
-
-	if (html) {
-		priv->html = g_strdup (html);
-	} else {
-		priv->html = NULL;
-	}
-
-	if (title) {
-		priv->title = g_strdup (title);
-	} else {
-		priv->title = NULL;
-	}
-
-	if (icon) {
-		priv->icon = g_strdup (icon);
-	} else {
-		priv->icon = NULL;
-	}
-}
-
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon)
-{
-	ExecutiveSummaryComponentView *view;
-
-	g_return_val_if_fail (control != NULL || html != NULL, NULL);
-	
-	view = gtk_type_new (executive_summary_component_view_get_type ());
-	executive_summary_component_view_construct (view, component, control,
-						    html, title, icon);
-
-	return view;
-}
-
-void
-executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-					    const char *title)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->title)
-		g_free (priv->title);
-	priv->title = g_strdup (title);
-
-	component = priv->component;
-	if (component == NULL) {
-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);
-		return;
-	}
-
-	executive_summary_component_set_title (component, view);
-}
-
-const char *
-executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return priv->title;
-}
-
-void
-executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-					   const char *icon)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->icon)
-		g_free (priv->icon);
-	priv->icon = g_strdup (icon);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	
-	executive_summary_component_set_icon (component, view);
-}
-
-const char *
-executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->icon;
-}
-
-void
-executive_summary_component_view_flash (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	
-	priv = view->private;
-	component = priv->component;
-	if (component == NULL) {
-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);
-		return;
-	}
-
-	executive_summary_component_flash (component, view);
-}
-
-void
-executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-					   const char *html)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-	ExecutiveSummaryComponent *component;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-	if (priv->html)
-		g_free (priv->html);
-
-	priv->html = g_strdup (html);
-
-	component = priv->component;
-	if (component == NULL) {
-		return;
-	}
-
-	executive_summary_component_update (component, view);
-}
-
-const char *
-executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-	
-	return priv->html;
-}
-
-BonoboObject *
-executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, NULL);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);
-
-	priv = view->private;
-
-	return priv->control;
-}
-
-void
-executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,
-					 int id)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	priv = view->private;
-
-	priv->id = id;
-}
-
-int
-executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view)
-{
-	ExecutiveSummaryComponentViewPrivate *priv;
-
-	g_return_val_if_fail (view != NULL, -1);
-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), -1);
-
-	priv = view->private;
-	
-	return priv->id;
-}
diff --git a/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h
deleted file mode 100644
index ecd0c7ab33..0000000000
--- a/executive-summary/evolution-services/executive-summary-component-view.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-#define __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__
-
-#include <evolution-services/executive-summary-component.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))
-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))
-
-typedef struct _ExecutiveSummaryComponentViewPrivate ExecutiveSummaryComponentViewPrivate;
-typedef struct _ExecutiveSummaryComponentView ExecutiveSummaryComponentView;
-typedef struct _ExecutiveSummaryComponentViewClass ExecutiveSummaryComponentViewClass;
-
-struct _ExecutiveSummaryComponentView {
-  GtkObject object;
-
-  ExecutiveSummaryComponentViewPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentViewClass {
-  GtkObjectClass parent_class;
-};
-
-GtkType executive_summary_component_view_get_type (void);
-void 
-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,
-					    ExecutiveSummaryComponent *component,
-					    BonoboControl *control,
-					    const char *html,
-					    const char *title,
-					    const char *icon);
-ExecutiveSummaryComponentView *
-executive_summary_component_view_new (ExecutiveSummaryComponent *component,
-				      BonoboControl *control,
-				      const char *html,
-				      const char *title,
-				      const char *icon);
-
-void executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,
-						 const char *title);
-const char *executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,
-						const char *icon);
-const char *executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_flash (ExecutiveSummaryComponentView *view);
-
-void executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,
-						const char *html);
-const char *executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view);
-BonoboObject *executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view);
-
-int executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view);
-
-#endif
-
-
diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c
deleted file mode 100644
index c07afc498a..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.c - Bonobo implementation of 
- *                                 SummaryComponent.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary.h"
-#include "executive-summary-component.h"
-#include "executive-summary-component-view.h"
-#include "executive-summary-client.h"
-
-static void executive_summary_component_destroy (GtkObject *object);
-static void executive_summary_component_init (ExecutiveSummaryComponent *component);
-static void executive_summary_component_class_init (ExecutiveSummaryComponentClass *esc_class);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-static BonoboObjectClass *parent_class;
-
-struct _ExecutiveSummaryComponentPrivate {
-	EvolutionServicesCreateViewFn create_view;
-	EvolutionServicesConfigureFn configure;
-	
-	ExecutiveSummaryClient *owner_client;
-	
-	void *closure;
-
-	GHashTable *id_to_view;
-};
-
-/* CORBA interface */
-static POA_Evolution_SummaryComponent__vepv SummaryComponent_vepv;
-
-static POA_Evolution_SummaryComponent *
-create_servant (void)
-{
-	POA_Evolution_SummaryComponent *servant;
-	CORBA_Environment ev;
-	
-	servant = (POA_Evolution_SummaryComponent *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SummaryComponent_vepv;
-	
-	CORBA_exception_init (&ev);
-	POA_Evolution_SummaryComponent__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return servant;
-}
-
-#if 0
-static void
-impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant,
-					  CORBA_boolean *html,
-					  CORBA_boolean *bonobo,
-					  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	*html = (priv->create_html_view != NULL);
-	*bonobo = (priv->create_bonobo_view != NULL);
-}
-#endif
-
-static void
-impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant,
-					   Evolution_Summary summary,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	ExecutiveSummaryClient *client;
-	Evolution_Summary summary_duplicate;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	/* Create a summary client */
-	client = gtk_type_new (executive_summary_client_get_type ());
-
-	summary_duplicate = CORBA_Object_duplicate (summary, ev);
-	executive_summary_client_construct (client, summary_duplicate);
-
-	priv->owner_client = client;
-}
-
-static void
-impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant,
-					     CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	if (priv->owner_client == NULL)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-	priv->owner_client = NULL;
-}
-
-static CORBA_long
-impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant,
-					     CORBA_long id,
-					     Bonobo_Control *control,
-					     CORBA_char **html,
-					     CORBA_char **title,
-					     CORBA_char **icon,
-					     CORBA_Environment *ev)
-{
-	ExecutiveSummaryComponentView *view;
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	BonoboObject *initial_control;
-	const char *initial_title, *initial_icon, *initial_html;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-	
-	view = gtk_type_new (executive_summary_component_view_get_type ());
-	executive_summary_component_view_set_id (view, id);
-
-	(* priv->create_view) (component, view, priv->closure);
-	
-	/* Extract the values */
-	initial_title = executive_summary_component_view_get_title (view);
-	initial_icon = executive_summary_component_view_get_icon (view);
-	initial_html = executive_summary_component_view_get_html (view);
-	initial_control = executive_summary_component_view_get_control (view);
-
-	/* Put the view in the hash table so it can be found later */
-	g_hash_table_insert (priv->id_to_view, GINT_TO_POINTER (id), view);
-
-	/* Duplicate the values */
-	if (initial_control != NULL) {
-		*control = bonobo_object_corba_objref (BONOBO_OBJECT (initial_control));
-	} else {
-		*control = CORBA_OBJECT_NIL;
-	}
-
-	*html = CORBA_string_dup (initial_html ? initial_html:"");
-	*title = CORBA_string_dup (initial_title ? initial_title:"");
-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");
-
-	return id;
-}
-
-#if 0
-static CORBA_char *
-impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant,
-						  CORBA_char **title,
-						  CORBA_char **icon,
-						  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	CORBA_char *ret_str;
-	char *ret_html;
-	char *initial_title, *initial_icon;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	ret_html = (* priv->create_html_view) (component, &initial_title,
-					       &initial_icon,
-					       priv->closure);
-
-	*title = CORBA_string_dup (initial_title ? initial_title:"");
-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");
-	g_free (initial_title);
-	g_free (initial_icon);
-
-	ret_str = CORBA_string_dup (ret_html ? ret_html:"");
-	g_free (ret_html);
-	return ret_str;
-}
-#endif	
-
-static void
-impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant,
-					      CORBA_long id,
-					      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	ExecutiveSummaryComponentView *view;
-
-	g_print ("%s\n", __FUNCTION__);
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-
-	view = g_hash_table_lookup (priv->id_to_view, GINT_TO_POINTER (id));
-	if (view == NULL) {
-		g_warning ("Unknown view: %d. Emit exception", id);
-		return;
-	}
-
-	/* Destroy the view */
-	gtk_object_unref (GTK_OBJECT (view));
-}
-
-static void
-impl_Evolution_SummaryComponent_configure (PortableServer_Servant servant,
-					   CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	bonobo_object = bonobo_object_from_servant (servant);
-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);
-	priv = component->private;
-	
-	(* priv->configure) (component, priv->closure);
-}
-
-static void
-executive_summary_component_destroy (GtkObject *object)
-{
-	ExecutiveSummaryComponent *component;
-	ExecutiveSummaryComponentPrivate *priv;
-	CORBA_Environment ev;
-	
-	component = EXECUTIVE_SUMMARY_COMPONENT (object);
-	priv = component->private;
-	
-	if (priv == NULL)
-		return;
-	
-	CORBA_exception_init (&ev);
-	
-	if (priv->owner_client != NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->owner_client));
-		priv->owner_client = NULL;
-	}
-
-	CORBA_exception_free (&ev);
-	
-	g_free (priv);
-	component->private = NULL;
-	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Init */
-static void
-corba_class_init (void)
-{
-	POA_Evolution_SummaryComponent__vepv *vepv;
-	POA_Evolution_SummaryComponent__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-	
-	epv = g_new0 (POA_Evolution_SummaryComponent__epv, 1);
-	epv->set_owner = impl_Evolution_SummaryComponent_set_owner;
-	epv->unset_owner = impl_Evolution_SummaryComponent_unset_owner;
-	epv->create_view = impl_Evolution_SummaryComponent_create_view;
-	epv->destroy_view = impl_Evolution_SummaryComponent_destroy_view;
-	epv->configure = impl_Evolution_SummaryComponent_configure;
-	
-	vepv = &SummaryComponent_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_SummaryComponent_epv = epv;
-}
-
-static void
-executive_summary_component_class_init (ExecutiveSummaryComponentClass *klass)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = GTK_OBJECT_CLASS (klass);
-	object_class->destroy = executive_summary_component_destroy;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	corba_class_init ();
-}
-
-static void
-executive_summary_component_init (ExecutiveSummaryComponent *component)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	priv = g_new0 (ExecutiveSummaryComponentPrivate, 1);
-	
-	priv->create_view = NULL;
-	priv->configure = NULL;
-	
-	priv->owner_client = NULL;
-	priv->closure = NULL;
-
-	priv->id_to_view = g_hash_table_new (NULL, NULL);
-	component->private = priv;
-}
-
-static void
-executive_summary_component_construct (ExecutiveSummaryComponent *component,
-				       Evolution_SummaryComponent corba_object,
-				       EvolutionServicesCreateViewFn create_view,
-				       EvolutionServicesConfigureFn configure,
-				       void *closure)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
-	
-	bonobo_object_construct (BONOBO_OBJECT (component), corba_object);
-	
-	priv = component->private;
-	
-	priv->create_view = create_view;
-	priv->configure = configure;
-	
-	priv->closure = closure;
-}
-
-BonoboObject *
-executive_summary_component_new (EvolutionServicesCreateViewFn create_view,
-				 EvolutionServicesConfigureFn configure,
-				 void *closure)
-{
-	ExecutiveSummaryComponent *component;
-	POA_Evolution_SummaryComponent *servant;
-	Evolution_SummaryComponent corba_object;
-	
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	component = gtk_type_new (executive_summary_component_get_type ());
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (component),
-						       servant);
-	
-	executive_summary_component_construct (component, corba_object,
-					       create_view, configure, closure);
-	
-	return BONOBO_OBJECT (component);
-}
-
-E_MAKE_TYPE (executive_summary_component, "ExecutiveSummaryComponent", 
-	     ExecutiveSummaryComponent, executive_summary_component_class_init,
-	     executive_summary_component_init, PARENT_TYPE);
-
-void
-executive_summary_component_set_title (ExecutiveSummaryComponent *component,
-				       gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *title;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	title = executive_summary_component_view_get_title (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_set_title (priv->owner_client, id, title);
-}
-
-void
-executive_summary_component_set_icon (ExecutiveSummaryComponent *component,
-				      gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *icon;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	icon = executive_summary_component_view_get_icon (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_set_icon (priv->owner_client, id, icon);
-}
-
-void
-executive_summary_component_flash (ExecutiveSummaryComponent *component,
-				   gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not owned!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_flash (priv->owner_client, id);
-}
-
-void
-executive_summary_component_update (ExecutiveSummaryComponent *component,
-				    gpointer view)
-{
-	ExecutiveSummaryComponentPrivate *priv;
-	int id;
-	const char *html;
-
-	g_return_if_fail (component != NULL);
-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));
-
-	priv = component->private;
-
-	if (priv->owner_client == NULL) {
-		g_warning ("Component not ownded!");
-		return;
-	}
-
-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-	html = executive_summary_component_view_get_html (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));
-
-	executive_summary_client_update (priv->owner_client, id, html);
-}
-
-int
-executive_summary_component_create_unique_id (void)
-{
-	static int id = 0;
-
-	id++;
-	g_print ("%s -- %d\n", __FUNCTION__, id);
-	return id;
-}
diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h
deleted file mode 100644
index 7d5ab904cc..0000000000
--- a/executive-summary/evolution-services/executive-summary-component.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary-component.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_H__
-#define _EXECUTIVE_SUMMARY_COMPONENT_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-
-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())
-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))
-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))
-
-typedef struct _ExecutiveSummaryComponentPrivate ExecutiveSummaryComponentPrivate;
-typedef struct _ExecutiveSummaryComponent ExecutiveSummaryComponent;
-typedef struct _ExecutiveSummaryComponentClass ExecutiveSummaryComponentClass;
-
-/* view is a ExecutiveSummaryComponentView * */
-typedef void (* EvolutionServicesCreateViewFn) (ExecutiveSummaryComponent *component,
-						gpointer view,
-						void *closure);
-typedef void (* EvolutionServicesConfigureFn) (ExecutiveSummaryComponent *component,
-					       void *closure);
-
-struct _ExecutiveSummaryComponent {
-  BonoboObject parent;
-
-  ExecutiveSummaryComponentPrivate *private;
-};
-
-struct _ExecutiveSummaryComponentClass {
-  BonoboObjectClass parent_class;
-};
-
-GtkType executive_summary_component_get_type (void);
-
-BonoboObject *executive_summary_component_new (EvolutionServicesCreateViewFn create_view,
-					       EvolutionServicesConfigureFn configure,
-					       void *closure);
-void executive_summary_component_set_title (ExecutiveSummaryComponent *component,
-					    gpointer view);
-void executive_summary_component_set_icon (ExecutiveSummaryComponent *component,
-					   gpointer view);
-
-void executive_summary_component_flash (ExecutiveSummaryComponent *component,
-					gpointer view);
-void executive_summary_component_update (ExecutiveSummaryComponent *component,
-					 gpointer view);
-int executive_summary_component_create_unique_id (void);
-
-#endif
diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c
deleted file mode 100644
index f8a0f7ecf8..0000000000
--- a/executive-summary/evolution-services/executive-summary.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.c - Bonobo implementation of Summary.idl
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <bonobo.h>
-#include <gnome.h>
-#include <gal/util/e-util.h>
-
-#include "Executive-Summary.h"
-#include "executive-summary.h"
-
-static void executive_summary_destroy (GtkObject *object);
-static void executive_summary_class_init (ExecutiveSummaryClass *es_class);
-static void executive_summary_init (ExecutiveSummary *es);
-
-#define PARENT_TYPE (bonobo_object_get_type ())
-
-enum {
-	UPDATE,
-	SET_TITLE,
-	SET_ICON,
-	FLASH,
-	LAST_SIGNAL
-};
-
-static guint32 summary_signals [LAST_SIGNAL] = { 0 };
-static BonoboObjectClass *parent_class;
-
-struct _ExecutiveSummaryPrivate {
-	int dummy;
-};
-
-/* CORBA interface implementation */
-static POA_Evolution_Summary__vepv Summary_vepv;
-
-static POA_Evolution_Summary *
-create_servant (void)
-{
-	POA_Evolution_Summary *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_Summary *)g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &Summary_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_Summary__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_Evolution_Summary_set_title (PortableServer_Servant servant,
-				  CORBA_long id,
-				  const CORBA_char *title,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_TITLE], 
-			 id, title);
-}
-
-static void
-impl_Evolution_Summary_set_icon (PortableServer_Servant servant,
-				 CORBA_long id,
-				 const CORBA_char *title,
-				 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_ICON],
-			 id, title);
-}
-
-static void
-impl_Evolution_Summary_flash (PortableServer_Servant servant,
-			      CORBA_long id,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[FLASH], id);
-}
-
-static void
-impl_Evolution_Summary_update_component (PortableServer_Servant servant,
-					 CORBA_long id,
-					 CORBA_char *html,
-					 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ExecutiveSummary *summary;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	summary = EXECUTIVE_SUMMARY (bonobo_object);
-
-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[UPDATE],
-			 id, html);
-}
-
-/* GtkObject methods */
-static void
-executive_summary_destroy (GtkObject *object)
-{
-	ExecutiveSummary *es;
-	ExecutiveSummaryPrivate *priv;
-	
-	es = EXECUTIVE_SUMMARY (object);
-	priv = es->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	es->private = NULL;
-}
-
-/* Initialisation */
-
-static void
-corba_class_init (void)
-{
-	POA_Evolution_Summary__vepv *vepv;
-	POA_Evolution_Summary__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-	
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private = NULL;
-	base_epv->finalize = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_Evolution_Summary__epv, 1);
-	epv->set_title = impl_Evolution_Summary_set_title;
-	epv->set_icon = impl_Evolution_Summary_set_icon;
-	epv->flash = impl_Evolution_Summary_flash;
-	epv->update_component = impl_Evolution_Summary_update_component;
-
-	vepv = &Summary_vepv;
-	vepv->_base_epv = base_epv;
-	vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	vepv->Evolution_Summary_epv = epv;
-}
-
-static void
-executive_summary_class_init (ExecutiveSummaryClass *es_class)
-{
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *) es_class;
-	
-	object_class->destroy = executive_summary_destroy;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	summary_signals[UPDATE] = gtk_signal_new ("update",
-						  GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, update),
-						  gtk_marshal_NONE__POINTER_POINTER,
-						  GTK_TYPE_NONE, 2,
-						  GTK_TYPE_POINTER,
-						  GTK_TYPE_POINTER);
-	summary_signals[SET_TITLE] = gtk_signal_new ("set_title",
-						     GTK_RUN_LAST,
-						     object_class->type,
-						     GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_title),
-						     gtk_marshal_NONE__POINTER_POINTER,
-						     GTK_TYPE_NONE, 2,
-						     GTK_TYPE_POINTER,
-						     GTK_TYPE_POINTER);
-	summary_signals[SET_ICON] = gtk_signal_new ("set_icon",
-						    GTK_RUN_LAST,
-						    object_class->type,
-						    GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_icon),
-						    gtk_marshal_NONE__POINTER_POINTER,
-						    GTK_TYPE_NONE, 2,
-						    GTK_TYPE_POINTER,
-						    GTK_TYPE_POINTER);
-	summary_signals[FLASH] = gtk_signal_new ("flash",
-						 GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, flash),
-						 gtk_marshal_NONE__POINTER,
-						 GTK_TYPE_NONE, 1,
-						 GTK_TYPE_POINTER);
-	gtk_object_class_add_signals (object_class, summary_signals, LAST_SIGNAL);
-
-	corba_class_init ();
-}
-
-static void
-executive_summary_init (ExecutiveSummary *es)
-{
-	ExecutiveSummaryPrivate *priv;
-
-	priv = g_new (ExecutiveSummaryPrivate, 1);
-	es->private = priv;
-}
-
-E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,
-	     executive_summary_class_init, executive_summary_init, PARENT_TYPE);
-
-void
-executive_summary_construct (ExecutiveSummary *es,
-			     Evolution_Summary corba_object)
-{
-	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);
-}
-
-BonoboObject *
-executive_summary_new (void)
-{
-	POA_Evolution_Summary *servant;
-	Evolution_Summary corba_object;
-	ExecutiveSummary *es;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-
-	es = gtk_type_new (executive_summary_get_type ());
-	
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (es), 
-						       servant);
-	executive_summary_construct (es, corba_object);
-	
-	return BONOBO_OBJECT (es);
-}  
diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h
deleted file mode 100644
index 4f6b959a9c..0000000000
--- a/executive-summary/evolution-services/executive-summary.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* executive-summary.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _EXECUTIVE_SUMMARY_H__
-#define _EXECUTIVE_SUMMARY_H__
-
-#include <gtk/gtksignal.h>
-#include <bonobo.h>
-#include "Executive-Summary.h"
-
-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())
-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))
-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))
-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))
-
-typedef struct _ExecutiveSummaryPrivate ExecutiveSummaryPrivate;
-typedef struct _ExecutiveSummary ExecutiveSummary;
-typedef struct _ExecutiveSummaryClass ExecutiveSummaryClass;
-
-struct _ExecutiveSummary {
-	BonoboObject parent;
-	
-	ExecutiveSummaryPrivate *private;
-};
-
-struct _ExecutiveSummaryClass {
-	BonoboObjectClass parent_class;
-
-	void (* update) (ExecutiveSummary *summary,
-			 const Evolution_SummaryComponent component,
-			 const char *html);
-	void (* set_title) (ExecutiveSummary *summary,
-			    const Evolution_SummaryComponent component,
-			    const char *title);
-	void (* set_icon) (ExecutiveSummary *summary,
-			   const Evolution_SummaryComponent component,
-			   const char *icon);
-	void (* flash) (ExecutiveSummary *summary,
-			const Evolution_SummaryComponent component);
-};
-
-GtkType executive_summary_get_type (void);
-void executive_summary_construct (ExecutiveSummary *es,
-				  Evolution_Summary corba_object);
-BonoboObject *executive_summary_new (void);
-#endif
diff --git a/executive-summary/idl/.cvsignore b/executive-summary/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/executive-summary/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
\ No newline at end of file
diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl
deleted file mode 100644
index ac3809e299..0000000000
--- a/executive-summary/idl/Executive-Summary.idl
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <Bonobo.idl>
-#include <SummaryComponent.idl>
-#include <Summary.idl>
diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am
deleted file mode 100644
index e45784d49c..0000000000
--- a/executive-summary/idl/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-INCLUDES = \
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	$(GNOME_VFS_CFLAGS)				\
-	$(UNICODE_CFLAGS)				\
-	$(GTKHTML_CFLAGS)				\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-
-EXTRA_DIST = $(IDLS)
-
-CLEANFILES = $(IDL_GENERATED)
-
-IDLS = \
-	Executive-Summary.idl		\
-	Summary.idl			\
-	SummaryComponent.idl
-
-IDL_GENERATED = \
-	Executive-Summary.h		\
-	Executive-Summary-common.c	\
-	Executive-Summary-skels.c	\
-	Executive-Summary-stubs.c
-
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
deleted file mode 100644
index 76f98dd537..0000000000
--- a/executive-summary/idl/Summary.idl
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution shell.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	interface Summary: Bonobo::Unknown {
-		exception NoSubWindow {};
-		
-		/**
-		 * set_title:
-		 * @component: The SummaryComponent whose window to set the title.
-		 * @title: The title.
-		 *
-		 * Sets the title of the subwindow that displays @component
-		 * to @title
-		 */
-		void set_title (in long id, 
-				in string title)
-			raises (NoSubWindow);
-
-		void set_icon (in long id,
-			       in string icon)
-			raises (NoSubWindow);
-
-		/**
-		 * flash:
-		 * @component: The SummaryComponent that owns a subwindow.
-		 *
-		 * Flashes the subwindow that displays @component.
-		 */
-		 void flash (in long id)
-			raises (NoSubWindow);
-
-		/**
-		 * update_html_component:
-		 * @component: The SummaryComponent that owns a subwindow.
-		 * @html: The new html that defines a component.
-		 *
-		 * Requests that the html that displays @component is changed
-		 * to @html.
-		 */
-		void update_component (in long id,
-				       in string html)
-			raises (NoSubWindow);
-	};
-};
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
deleted file mode 100644
index 1c60314fb2..0000000000
--- a/executive-summary/idl/SummaryComponent.idl
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the Evolution Executive Summary Components.
- *
- * Authors:
- *   Iain Holmes  <iain@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-/* TODO: Needs Exceptions */
-
-#include <Bonobo.idl>
-
-module Evolution {
-	interface Summary;
-
-	interface SummaryComponent: Bonobo::Unknown {
-
-		/**
-		 * set_owner:
-		 * @summary: A Summary object.
-		 *
-		 * Sets the owner of the component.
-		 */
-		void set_owner (in Summary owner);
-
-		/**
-		 * unset_owner:
-		 *
-		 * Unsets the owner of the component.
-		 */
-		void unset_owner ();
-
-		/**
-		 * create_view:
-		 * @control: A Bonobo_Control
-		 * @html: HTML of the view.
-		 * @title: Title of the view.
-		 * @icon: Icon to be used for the view.
-	 	 *
-		 * Creates a summary of the data that the component has.
-		 * Returns: The ID of the view.
-		 */
-		long create_view (in long id,
-				  out Bonobo::Control control,
-		                  out string html,
-				  out string title,
-			          out string icon);
-
-		/**
-		 * destroy_view:
-		 * @id: ID of the view to be destroyed.
-		 *
-		 * Tells a service that a view has been destroyed.
-		 */
-		void destroy_view (in long id);
-
-		/**
-		 * configure:
-		 * 
-		 * Instructs the component to open a preferences dialog.
-		 */
-		void configure ();
-
-	};
-};
diff --git a/executive-summary/test-service/.cvsignore b/executive-summary/test-service/.cvsignore
deleted file mode 100644
index 2473a602c4..0000000000
--- a/executive-summary/test-service/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-core
-.deps
-.libs
-test-service
\ No newline at end of file
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
deleted file mode 100644
index e294a3ea49..0000000000
--- a/executive-summary/test-service/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-bin_PROGRAMS = test-service
-
-CFLAGS += -g 
-INCLUDES = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/executive-summary	\
-	$(EXTRA_GNOME_CFLAGS)		\
-	$(BONOBO_HTML_GNOME_CFLAGS)	\
-	$(UNICODE_CFLAGS)
-
-test_service_SOURCES = 			\
-	main.c
-
-test_service_LDADD = 			\
-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\
-	$(BONOBO_VFS_GNOME_LIBS)	\
-	$(EXTRA_GNOME_LIBS)
-oafdir = $(datadir)/oaf
-oaf_DATA = test-service.oafinfo
-
-EXTRA_DIST = $(oaf_DATA) 
diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c
deleted file mode 100644
index 75bbc3199b..0000000000
--- a/executive-summary/test-service/main.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* main.c
- * Test Service that counts the number of seconds since it was started.
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <bonobo.h>
-
-#include <evolution-services/executive-summary-component.h>
-#include <evolution-services/executive-summary-component-view.h>
-
-#include <liboaf/liboaf.h>
-
-static int running_views = 0;
-
-struct userdata {
-	int i;
-};
-
-#define TEST_SERVICE_ID "OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-
-static BonoboGenericFactory *factory = NULL;
-
-/* The "do something interesting" function */
-int
-add_one (ExecutiveSummaryComponentView *view) 
-{
-	char *html;
-	struct userdata *ud;
-	
-	/* Get the user data from the view */
-	ud = gtk_object_get_data (GTK_OBJECT (view), "timer-data");
-	if (ud == NULL) {
-		g_warning ("No user data");
-		return FALSE;
-	}
-	
-	/* Generate the new html */
-	html = g_strdup_printf ("Since you started this service<br>"
-				"<center>%d</center><br>seconds have passed.", ud->i);
-	
-	/* Change the html on the view
-	   which will tell the Executive Summary that something needs updating */
-	executive_summary_component_view_set_html (view, html);
-	
-	/* executive_summary_component_view_set_html () makes a copy of the HTML
-	   passed into it, so we don't need to keep it around */
-	g_free (html);
-	
-	/* Do something "fun" */
-	ud->i++;
-	
-	return TRUE;
-}
-
-void
-view_destroyed (GtkObject *object,
-		gpointer data)
-{
-	ExecutiveSummaryComponentView *view;
-	struct userdata *ud;
-	int id;
-	
-	/* Free the user data for this view*/
-	ud = gtk_object_get_data (object, "timer-data");
-	gtk_object_set_data (object, "timer-data", NULL);
-	g_free (ud);
-	
-	/* Remove one running view */
-	running_views--;
-	
-	/* If there are no running views left, quit */
-	if (running_views <= 0)
-		gtk_main_quit ();
-}
-
-/* Create the view:
-   HTML only */
-static void
-create_view (ExecutiveSummaryComponent *component,
-	     ExecutiveSummaryComponentView *view,
-	     void *closure)
-{
-	char *html = "Since you started this service<br><center>0</center><br>seconds have passed.";
-	struct userdata *ud;
-	
-	g_print ("In: %s\n", __FUNCTION__);
-	/* Create the userdata structure */
-	ud = g_new (struct userdata, 1);
-	
-	ud->i = 1;
-	executive_summary_component_view_construct (view, component, NULL,
-						    html, "The Magic Counter",
-						    "gnome-clock.png");
-	g_print ("Out: %s\n", __FUNCTION__);
-	/* Set the user data on the object */
-	gtk_object_set_data (GTK_OBJECT (view), "timer-data", ud);
-	
-	/* Connect the the destroyed signal to find out 
-	   when the view is destroyed */
-	gtk_signal_connect (GTK_OBJECT (view), "destroy",
-			    GTK_SIGNAL_FUNC (view_destroyed), NULL);
-	
-	/* Increase the number of running views */
-	running_views++;
-	
-	/* Do something "interesting" once a second */
-	gtk_timeout_add (1000, add_one, view);
-}
-
-static void
-configure (ExecutiveSummaryComponent *component,
-	   void *closure)
-{
-	GtkWidget *window, *label;
-	
-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	label = gtk_label_new ("This is a configuration dialog.\nNo it really is");
-	
-	gtk_container_add (GTK_CONTAINER (window), label);
-	gtk_widget_show_all (window);
-}
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	ExecutiveSummaryComponent *component;
-	
-	/* Create an executive summary component for this factory */
-	component = executive_summary_component_new (create_view,
-						     configure,
-						     NULL);
-	return BONOBO_OBJECT (component);
-}
-
-void
-test_service_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-	
-	/* Register the factory creation function and the IID */
-	factory = bonobo_generic_factory_new (TEST_SERVICE_ID, factory_fn, NULL);
-	if (factory == NULL) {
-		g_warning ("Cannot initialize test service");
-		exit (0);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	CORBA_ORB orb;
-	
-	/* Init GNOME, oaf and bonobo */
-	gnome_init_with_popt_table ("Test service", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-	orb = oaf_init (argc, argv);
-	
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo");
-	}
-	
-	/* Register the factory */
-	test_service_factory_init ();
-	
-	/* Enter main */
-	bonobo_main ();
-	
-	return 0;
-}
-
diff --git a/executive-summary/test-service/test-service.oafinfo b/executive-summary/test-service/test-service.oafinfo
deleted file mode 100644
index 2c2329255d..0000000000
--- a/executive-summary/test-service/test-service.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"
-		type="exe"
-		location="test-service">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the test component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
-		type="factory"
-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Test service"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/executive-summary/widgets/.cvsignore b/executive-summary/widgets/.cvsignore
deleted file mode 100644
index ddca354b6d..0000000000
--- a/executive-summary/widgets/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-esummary-window-test
\ No newline at end of file
diff --git a/executive-summary/widgets/Makefile.am b/executive-summary/widgets/Makefile.am
deleted file mode 100644
index f83d956d63..0000000000
--- a/executive-summary/widgets/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-INCLUDES = 	\
-	-I$(top_srcdir) 	\
-	-I$(includedir)		\
-	$(GNOME_INCLUDEDIR)	\
-	-DG_LOG_DOMAIN=\"Executive-Summary-Widgets\"	\
-	-g 	\
-	-Wall	\
-	-Wmissing-prototypes	\
-	-Wmissing-declarations
-
-noinst_LIBRARIES = libesummary-widgets.a
-
-libesummary_widgets_a_SOURCES = 	\
-	e-summary-subwindow.c		\
-	e-summary-subwindow.h		\
-	e-summary-titlebar.c		\
-	e-summary-titlebar.h		\
-	e-summary-title-button.c	\
-	e-summary-title-button.h
-
-noinst_PROGRAMS =		\
-	esummary-window-test
-
-esummary_window_test_SOURCES =	\
-	esummary-window-test.c
-
-esummary_window_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	libesummary-widgets.a	\
-	$(BONOBO_GNOME_LIBS)	\
-	$(top_builddir)/e-util/libeutil.la
-
diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c
deleted file mode 100644
index bf5bcb1eba..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include "e-summary-subwindow.h"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-static void e_summary_subwindow_destroy (GtkObject *object);
-static void e_summary_subwindow_class_init (GtkObjectClass *object_class);
-static void e_summary_subwindow_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-
-struct _ESummarySubwindowPrivate {
-  GnomeCanvasItem *titlebar;
-  GnomeCanvasItem *contents;
-
-  GtkWidget *container;
-
-  char *title;
-};
-
-enum {
-  ARG_0,
-  ARG_X,
-  ARG_Y,
-  ARG_WIDTH,
-  ARG_HEIGHT,
-  ARG_STATE
-};
-
-enum {
-  CLOSE_CLICKED,
-  SHADE_CLICKED,
-  EDIT_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint32 e_summary_subwindow_signals[LAST_SIGNAL] = { 0 };
-
-static void
-e_summary_subwindow_destroy (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  priv = subwindow->private;
-
-  if (priv == NULL)
-    return;
-
-  if (priv->container) {
-    gtk_widget_destroy (priv->container);
-    priv->container = NULL;
-  }
-
-  if (priv->title) {
-    g_free (priv->title);
-    priv->title = NULL;
-  }
-
-  g_free (subwindow->private);
-  subwindow->private = NULL;
-
-  if (GTK_OBJECT_CLASS (parent_class)->destroy)
-  (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_subwindow_realize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_subwindow_unrealize (GnomeCanvasItem *item)
-{
-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_subwindow_class_init (GtkObjectClass *object_class)
-{
-  GnomeCanvasItemClass *item_class;
-
-  item_class = (GnomeCanvasItemClass *) object_class;
-
-  object_class->destroy = e_summary_subwindow_destroy;
-
-  item_class->realize = e_summary_subwindow_realize;
-  item_class->unrealize = e_summary_subwindow_unrealize;
-
-  parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_subwindow_init (GtkObject *object)
-{
-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);
-  ESummarySubwindowPrivate *priv;
-
-  subwindow->private = g_new0 (ESummarySubwindowPrivate, 1);
-  priv = subwindow->private;
-
-  priv->title = NULL;
-}
-
-E_MAKE_TYPE (e_summary_subwindow, "ESummarySubwindow", ESummarySubwindow,
-	     e_summary_subwindow_class_init, e_summary_subwindow_init,
-	     PARENT_TYPE);
-
-static void
-container_size_allocate (GtkWidget *widget,
-			 GtkAllocation *allocation,
-			 ESummarySubwindow *subwindow)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-
-  priv = subwindow->private;
-
-  gnome_canvas_item_set (priv->titlebar,
-			 "width", (double) allocation->width - 1,
-			 NULL);
-
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummarySubwindow *subwindow)
-{
-	g_print ("EDIT!\n");
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("SHADE!\n");
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummarySubwindow *subwindow)
-{
-	g_print ("CLOSE!\n");
-	gtk_object_destroy (GTK_OBJECT (subwindow));
-}
-
-void
-e_summary_subwindow_construct (GnomeCanvasItem *item)
-{
-  GnomeCanvasGroup *group;
-  ESummarySubwindow *subwindow;
-  ESummarySubwindowPrivate *priv;
-  EFont *font;
-  int titlebar_height;
-
-  g_return_if_fail (item != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (item));
-
-  subwindow = E_SUMMARY_SUBWINDOW (item);
-  priv = subwindow->private;
-
-  group = GNOME_CANVAS_GROUP (item);
-
-  font = e_font_from_gdk_font ( ((GtkWidget *) item->canvas)->style->font);
-
-  titlebar_height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-
-  priv->titlebar = gnome_canvas_item_new (group,
-					  e_summary_titlebar_get_type (),
-					  "text", "Titlebar",
-					  "width", 100.0,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "edit",
-		      GTK_SIGNAL_FUNC (edit_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "shade",
-		      GTK_SIGNAL_FUNC (shade_cb), subwindow);
-  gtk_signal_connect (GTK_OBJECT (priv->titlebar), "close",
-		      GTK_SIGNAL_FUNC (close_cb), subwindow);
-
-  priv->container = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (priv->container), GTK_SHADOW_ETCHED_IN);
-  gtk_widget_show (priv->container);
-  
-  priv->contents = gnome_canvas_item_new (group,
-					  gnome_canvas_widget_get_type (),
-					  "x", (double) 0,
-					  "y", (double) titlebar_height + 1,
-					  "widget", priv->container,
-					  NULL);
-  gtk_signal_connect (GTK_OBJECT (priv->container), "size_allocate",
-		      GTK_SIGNAL_FUNC (container_size_allocate), subwindow);
-  
-}
-
-GnomeCanvasItem *
-e_summary_subwindow_new (GnomeCanvasGroup *parent,
-			 double x,
-			 double y)
-{
-  GnomeCanvasItem *item;
-
-  item = gnome_canvas_item_new (parent, e_summary_subwindow_get_type (), 
-				"x", x,
-				"y", y,
-				NULL);
-  e_summary_subwindow_construct (item);
-
-  return item;
-}
-
-/* These functions mimic the GtkContainer methods */
-
-void
-e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			 GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_add (GTK_CONTAINER (priv->container), widget);
-  
-}
-
-void
-e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-			    GtkWidget *widget)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_WIDGET (widget));
-
-  priv = subwindow->private;
-
-  gtk_container_remove (GTK_CONTAINER (priv->container), widget);
-}
-
-void
-e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-			       const char *title)
-{
-  ESummarySubwindowPrivate *priv;
-
-  g_return_if_fail (subwindow != NULL);
-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));
-  g_return_if_fail (title != NULL);
-
-  priv = subwindow->private;
-  if (priv->title)
-    g_free (priv->title);
-
-  priv->title = g_strdup (title);
-}
diff --git a/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h
deleted file mode 100644
index daad080a9c..0000000000
--- a/executive-summary/widgets/e-summary-subwindow.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-subwindow.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_SUBWINDOW_H__
-#define _E_SUMMARY_SUBWINDIW_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_SUBWINDOW_TYPE (e_summary_subwindow_get_type ())
-#define E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindow))
-#define E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindowClass))
-#define IS_E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-#define IS_E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))
-
-typedef struct _ESummarySubwindowPrivate ESummarySubwindowPrivate;
-typedef struct _ESummarySubwindow ESummarySubwindow;
-typedef struct _ESummarySubwindowClass ESummarySubwindowClass;
-
-struct _ESummarySubwindow {
-  GnomeCanvasGroup parent;
-
-  ESummarySubwindowPrivate *private;
-};
-
-struct _ESummarySubwindowClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close_clicked) (ESummarySubwindow *window);
-  void (*shade_clicked) (ESummarySubwindow *window);
-  void (*edit_clicked) (ESummarySubwindow *window);
-};
-
-GtkType e_summary_subwindow_get_type (void);
-
-void e_summary_subwindow_construct (GnomeCanvasItem *subwindow);
-GnomeCanvasItem *e_summary_subwindow_new (GnomeCanvasGroup *parent,
-					  double x,
-					  double y);
-
-void e_summary_subwindow_add (ESummarySubwindow *subwindow,
-			      GtkWidget *widget);
-void e_summary_subwindow_remove (ESummarySubwindow *subwindow,
-				 GtkWidget *widget);
-void e_summary_subwindow_set_title (ESummarySubwindow *subwindow,
-				    const char *title);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c
deleted file mode 100644
index 81fa8e5923..0000000000
--- a/executive-summary/widgets/e-summary-title-button.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-buttons.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <gal/util/e-util.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-title-button.h"
-
-#define PARENT_TYPE (gnome_canvas_rect_get_type ())
-
-enum {
-	ARG_0,
-	ARG_PIXBUF,
-	ARG_X,
-	ARG_Y
-};
-
-enum {
-	CLICKED,
-	LAST_SIGNAL
-};
-
-static void e_summary_title_button_destroy (GtkObject *object);
-static void e_summary_title_button_set_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_get_arg (GtkObject *object,
-					    GtkArg *arg,
-					    guint arg_id);
-static void e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class);
-static void e_summary_title_button_init (ESummaryTitleButton *estb);
-static double e_summary_title_button_point (GnomeCanvasItem *item,
-					    double x,
-					    double y,
-					    int cx,
-					    int cy,
-					    GnomeCanvasItem **actual_item);
-static void e_summary_title_button_update (GnomeCanvasItem *item,
-					   double affine[6],
-					   ArtSVP *clip_path,
-					   gint flags);
-static void e_summary_title_button_draw (GnomeCanvasItem *item,
-					 GdkDrawable *drawable,
-					 int x, int y,
-					 int width, int height);
-static gint e_summary_title_button_event (GnomeCanvasItem *item,
-					  GdkEvent *event);
-
-static GnomeCanvasRectClass *parent_class;
-static guint estb_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitleButtonPrivate {
-	GdkPixbuf *pixbuf;
-	double x, y;
-	int width, height;
-
-	int in_button : 1;
-	int button_down : 1;
-};
-
-static void
-e_summary_title_button_destroy (GtkObject *object)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	if (priv == NULL)
-		return;
-	
-	gdk_pixbuf_unref (priv->pixbuf);
-	
-	g_free (priv);
-	estb->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-e_summary_title_button_set_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	gboolean update = FALSE;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		if (priv->pixbuf)
-			gdk_pixbuf_unref (priv->pixbuf);
-		
-		priv->pixbuf = GTK_VALUE_POINTER (*arg);
-		gdk_pixbuf_ref (priv->pixbuf);
-		
-		priv->width = gdk_pixbuf_get_width (priv->pixbuf);
-		priv->height = gdk_pixbuf_get_height (priv->pixbuf);
-		
-		update = TRUE;
-		break;
-		
-	case ARG_X: 
-		priv->x = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	case ARG_Y:
-		priv->y = GTK_VALUE_DOUBLE (*arg);
-		break;
-		
-	default:
-		break;
-		
-	}
-	
-	if (update)
-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (estb));
-	
-}
-
-static void
-e_summary_title_button_get_arg (GtkObject *object,
-				GtkArg *arg,
-				guint arg_id)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (object);
-	priv = estb->private;
-	
-	switch (arg_id) {
-	case ARG_PIXBUF:
-		GTK_VALUE_POINTER (*arg) = priv->pixbuf;
-		break;
-		
-	case ARG_X:
-		GTK_VALUE_DOUBLE (*arg) = priv->x;
-		break;
-		
-	case ARG_Y:
-		GTK_VALUE_DOUBLE (*arg) = priv->y;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-		
-	}
-}
-
-static void
-e_summary_title_button_init (ESummaryTitleButton *estb)
-{
-	estb->private = g_new0 (ESummaryTitleButtonPrivate, 1);
-}
-
-static void
-e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass *) estb_class;
-	item_class = (GnomeCanvasItemClass *) estb_class;
-	
-	object_class->destroy = e_summary_title_button_destroy;
-	object_class->set_arg = e_summary_title_button_set_arg;
-	object_class->get_arg = e_summary_title_button_get_arg;
-	
-	item_class->draw = e_summary_title_button_draw;
-	item_class->point = e_summary_title_button_point;
-	item_class->update = e_summary_title_button_update;
-	item_class->event = e_summary_title_button_event;
-	
-	gtk_object_add_arg_type ("ESummaryTitleButton::pixbuf",
-				 GTK_TYPE_POINTER,
-				 GTK_ARG_READWRITE,
-				 ARG_PIXBUF);
-	gtk_object_add_arg_type ("ESummaryTitleButton::x",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_X);
-	gtk_object_add_arg_type ("ESummaryTitleButton::y",
-				 GTK_TYPE_DOUBLE,
-				 GTK_ARG_READWRITE,
-				 ARG_Y);
-	estb_signals[CLICKED] = gtk_signal_new ("clicked", GTK_RUN_LAST,
-						object_class->type,
-						GTK_SIGNAL_OFFSET (ESummaryTitleButtonClass,
-								   clicked),
-						gtk_marshal_NONE__NONE,
-						GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, estb_signals, LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-E_MAKE_TYPE (e_summary_title_button, "ESummaryTitleButton", 
-	     ESummaryTitleButton, e_summary_title_button_class_init,
-	     e_summary_title_button_init, PARENT_TYPE);
-
-static double
-e_summary_title_button_point (GnomeCanvasItem *item,
-			      double x,
-			      double y,
-			      int cx,
-			      int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double d = 1.0;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (x >= priv->x && x <= priv->x + gdk_pixbuf_get_width (priv->pixbuf)
-	    && y >= priv->y && y <= priv->y + gdk_pixbuf_get_height (priv->pixbuf)) {
-		d = 0.0;
-		*actual_item = item;
-	}
-
-	return d;
-}
-
-static void
-get_bounds (ESummaryTitleButton *estb,
-	    double *px1, double *py1,
-	    double *px2, double *py2)
-{
-	GnomeCanvasItem *item;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	int cx1, cy1, cx2, cy2;
-	
-	item = GNOME_CANVAS_ITEM (estb);
-	priv = estb->private;
-	
-	x1 = priv->x;
-	y1 = priv->y;
-	x2 = x1 + priv->width;
-	y2 = y1 + priv->height;
-	
-	gnome_canvas_item_i2w (item, &x1, &y1);
-	gnome_canvas_item_i2w (item, &x2, &x2);
-	gnome_canvas_w2c (item->canvas, x1, y1, &cx1, &cy1);
-	gnome_canvas_w2c (item->canvas, x2, y2, &cx2, &cy2);
-	
-	*px1 = cx1;
-	*py1 = cy1;
-	*px2 = cx2;
-	*py2 = cy2;
-}
-
-static void
-e_summary_title_button_update (GnomeCanvasItem *item,
-			       double affine[6],
-			       ArtSVP *clip_path,
-			       gint flags)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double x1, y1, x2, y2;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	get_bounds (estb, &x1, &y1, &x2, &y2);
-	gnome_canvas_update_bbox (item, (int) x1, (int) y1, (int) x2, (int) y2);
-}
-
-static void
-e_summary_title_button_draw (GnomeCanvasItem *item,
-			     GdkDrawable *drawable,
-			     int x, int y,
-			     int width, int height)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-	double i2w[6], w2c[6], i2c[6];
-	int x1, x2, y1, y2;
-	ArtPoint i1, i2;
-	ArtPoint c1, c2;
-	GdkGC *gc;
-	
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->draw)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->draw) (item, drawable, x, y, width, height);
-	
-	gnome_canvas_item_i2w_affine (item, i2w);
-	gnome_canvas_w2c_affine (item->canvas, w2c);
-	art_affine_multiply (i2c, i2w, w2c);
-	
-	i1.x = priv->x;
-	i1.y = priv->y;
-	i2.x = i1.x + priv->width + 4;
-	i2.y = i1.y + priv->height + 4;
-	art_affine_point (&c1, &i1, i2c);
-	art_affine_point (&c2, &i2, i2c);
-	x1 = c1.x;
-	y1 = c1.y;
-	x2 = c2.x;
-	y2 = c2.y;
-	
-	gc = gdk_gc_new (item->canvas->layout.bin_window);
-	gdk_draw_rectangle (drawable, gc,
-			    FALSE, x1 - x,
-			    y1 - y,
-			    x2 - x1,
-			    y2 - y1);
-	gdk_gc_unref (gc);
-	
-	gdk_pixbuf_render_to_drawable_alpha (priv->pixbuf,
-					     drawable,
-					     0, 0,
-					     x1 + 2, y1 + 2,
-					     priv->width, priv->height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     127,
-					     GDK_RGB_DITHER_NORMAL,
-					     0, 0);
-}
-
-static gint
-e_summary_title_button_event (GnomeCanvasItem *item,
-			      GdkEvent *event)
-{
-	ESummaryTitleButton *estb;
-	ESummaryTitleButtonPrivate *priv;
-
-	estb = E_SUMMARY_TITLE_BUTTON (item);
-	priv = estb->private;
-
-	switch (event->type) {
-	case GDK_ENTER_NOTIFY:
-		priv->in_button = TRUE;
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		priv->in_button = FALSE;
-		break;
-
-	case GDK_BUTTON_PRESS:
-		if (priv->in_button) {
-			priv->button_down = TRUE;
-			gnome_canvas_item_grab (item,
-						GDK_LEAVE_NOTIFY_MASK |
-						GDK_ENTER_NOTIFY_MASK |
-						GDK_POINTER_MOTION_MASK |
-						GDK_BUTTON_RELEASE_MASK,
-						NULL, event->button.time);
-		}
-		break;
-	
-	case GDK_BUTTON_RELEASE:
-		priv->button_down = FALSE;
-		gnome_canvas_item_ungrab (item, event->button.time);
-
-		if (priv->in_button) {
-			gtk_signal_emit (GTK_OBJECT (estb), estb_signals[CLICKED]);
-		}
-		break;
-		
-	default:
-		return TRUE;
-	}
-
-	return FALSE;
-}
diff --git a/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h
deleted file mode 100644
index a99a96815a..0000000000
--- a/executive-summary/widgets/e-summary-title-button.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-title-button.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_TITLE_BUTTON_H__
-#define _E_SUMMARY_TITLE_BUTTON_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLE_BUTTON_TYPE (e_summary_title_button_get_type ())
-#define E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButton))
-#define E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButtonClass))
-#define IS_E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-#define IS_E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))
-
-typedef struct _ESummaryTitleButtonPrivate ESummaryTitleButtonPrivate;
-typedef struct _ESummaryTitleButton ESummaryTitleButton;
-typedef struct _ESummaryTitleButtonClass ESummaryTitleButtonClass;
-
-struct _ESummaryTitleButton {
-	GnomeCanvasRect parent;
-	
-	ESummaryTitleButtonPrivate *private;
-};
-
-struct _ESummaryTitleButtonClass {
-	GnomeCanvasRectClass parent_class;
-	
-	void (*clicked) (ESummaryTitleButton *estb);
-};
-
-GtkType e_summary_title_button_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c
deleted file mode 100644
index 3188b78bf8..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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 <gnome.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-font.h>
-
-#include <gal/e-text/e-text.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include "e-summary-titlebar.h"
-#include "e-summary-title-button.h"
-
-/* XPMS */
-#include "edit.xpm"
-#include "x.xpm"
-#include "shade.xpm"
-
-#define PARENT_TYPE (gnome_canvas_group_get_type ())
-#define TITLEBAR_BORDER_WIDTH 2
-
-enum {
-	ARG_0,
-	ARG_TEXT,
-	ARG_WIDTH,
-	ARG_HEIGHT
-};
-
-enum {
-	EDIT,
-	SHADE,
-	CLOSE,
-	LAST_SIGNAL
-};
-
-static void e_summary_titlebar_destroy (GtkObject *object);
-static void e_summary_titlebar_class_init (GtkObjectClass *object_class);
-static void e_summary_titlebar_init (GtkObject *object);
-
-static GnomeCanvasGroupClass *parent_class;
-static guint titlebar_signals[LAST_SIGNAL] = { 0 };
-
-struct _ESummaryTitlebarPrivate {
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *titletext;
-	
-	GnomeCanvasItem *edit;
-	GnomeCanvasItem *shade;
-	GnomeCanvasItem *close;
-	
-	char *text;
-	double width, height;
-};
-
-static void
-e_summary_titlebar_destroy (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	if (priv == NULL)
-		return;
-	
-	g_free (priv);
-	titlebar->private = NULL;
-	
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static void
-edit_cb (GnomeCanvasItem *item,
-	 ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[EDIT]);
-}
-
-static void
-shade_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[SHADE]);
-}
-
-static void
-close_cb (GnomeCanvasItem *item,
-	  ESummaryTitlebar *titlebar)
-{
-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[CLOSE]);
-}
-
-static void
-e_summary_titlebar_realize (GnomeCanvasItem *item)
-{
-	GnomeCanvasGroup *group;
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	GdkPixbuf *pb;
-	EFont *font;
-	int font_height;
-	
-	group = GNOME_CANVAS_GROUP (item);
-	titlebar = E_SUMMARY_TITLEBAR (item);
-	priv = titlebar->private;
-	
-	font = e_font_from_gdk_font (GTK_WIDGET (item->canvas)->style->font);
-	font_height = e_font_height (font);
-	priv->height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */
-	
-	priv->rect = gnome_canvas_item_new (group,
-					    gnome_canvas_rect_get_type (),
-					    "x1", 0.0,
-					    "y1", 0.0,
-					    "y2", (double) priv->height,
-					    "x2", priv->width, 
-					    "fill_color_rgba", 0x88AAFFFF,
-					    NULL);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) x_xpm);
-	priv->close = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - TITLEBAR_BORDER_WIDTH - 18,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) shade_xpm);
-	priv->shade = gnome_canvas_item_new (group,
-					     e_summary_title_button_get_type (),
-					     "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 2) - 36,
-					     "y", (double) TITLEBAR_BORDER_WIDTH,
-					     "pixbuf", pb,
-					     NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->shade), "clicked",
-			    GTK_SIGNAL_FUNC (shade_cb), titlebar);
-	
-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) edit_xpm);
-	priv->edit = gnome_canvas_item_new (group,
-					    e_summary_title_button_get_type (),
-					    "x", (double) priv->width - (TITLEBAR_BORDER_WIDTH * 3) - 54,
-					    "y", (double) TITLEBAR_BORDER_WIDTH,
-					    "pixbuf", pb,
-					    NULL);
-	gdk_pixbuf_unref (pb);
-	gtk_signal_connect (GTK_OBJECT (priv->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_cb), titlebar);
-	
-	priv->titletext = gnome_canvas_item_new (group,
-						 e_text_get_type (),
-						 "text", priv->text,
-						 "font_gdk", GTK_WIDGET (item->canvas)->style->font,
-						 "clip_width", (double) priv->width - 
-						 (TITLEBAR_BORDER_WIDTH*4)- 50,
-						 "clip_height", (double) e_font_height (font),
-
-						 "clip", TRUE,
-						 "use_ellipsis", TRUE,
-						 "fill_color", "black",
-						 "anchor", GTK_ANCHOR_NW,
-						 NULL);
-	gnome_canvas_item_move (priv->titletext, TITLEBAR_BORDER_WIDTH,
-				(priv->height - font_height) / 2);
-	
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->realize) (item);
-}
-
-static void
-e_summary_titlebar_unrealize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize) (item);
-}
-
-static void
-e_summary_titlebar_set_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		if (priv->text)
-			g_free (priv->text);
-		
-		priv->text = g_strdup (GTK_VALUE_STRING (*arg));
-		
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "text", priv->text,
-					       NULL);
-		break;
-		
-	case ARG_WIDTH:
-		priv->width = GTK_VALUE_DOUBLE (*arg);
-		
-		if (priv->rect)
-			gnome_canvas_item_set (priv->rect,
-					       "x2", priv->width,
-					       NULL);
-		if (priv->titletext)
-			gnome_canvas_item_set (priv->titletext,
-					       "clip_width", priv->width - 
-					       (TITLEBAR_BORDER_WIDTH* 4) - 42,
-					       NULL);
-		break;
-		
-	default:
-		break;
-	}
-}
-
-static void
-e_summary_titlebar_get_arg (GtkObject *object,
-			    GtkArg *arg,
-			    guint arg_id)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	priv = titlebar->private;
-	
-	switch (arg_id) {
-	case ARG_TEXT:
-		GTK_VALUE_STRING (*arg) = priv->text;
-		break;
-		
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = priv->width;
-		break;
-		
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = priv->height;
-		break;
-		
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static gint
-e_summary_titlebar_event (GnomeCanvasItem *item,
-			  GdkEvent *event)
-{
-	if (event->type == GDK_2BUTTON_PRESS &&
-	    event->button.button == 1) {
-		gtk_signal_emit (GTK_OBJECT (item), titlebar_signals[SHADE]);
-		return FALSE;
-	} else {
-		return TRUE;
-	}
-}
-
-static double
-e_summary_titlebar_point (GnomeCanvasItem *item,
-			  double x,
-			  double y,
-			  int cx,
-			  int cy,
-			  GnomeCanvasItem **actual_item)
-{
-	ESummaryTitlebar *est;
-	ESummaryTitlebarPrivate *priv;
-	GnomeCanvasItem *ret_item;
-	double d;
-
-	est = E_SUMMARY_TITLEBAR (item);
-	priv = est->private;
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->edit)->klass)->point) (priv->edit,
-						       x, y, 
-						       cx, cy,
-						       &ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS 
-	     (GTK_OBJECT (priv->shade)->klass)->point) (priv->shade,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	d = (* GNOME_CANVAS_ITEM_CLASS
-	     (GTK_OBJECT (priv->close)->klass)->point) (priv->close,
-							x, y,
-							cx, cy,
-							&ret_item);
-	if (d == 0.0) {
-		*actual_item = ret_item;
-		return 0.0;
-	}
-
-	*actual_item = item;
-	return 0.0;
-}
-
-static void
-e_summary_titlebar_class_init (GtkObjectClass *object_class)
-{
-	GnomeCanvasItemClass *item_class;
-	
-	item_class = (GnomeCanvasItemClass *) object_class;
-	
-	object_class->destroy = e_summary_titlebar_destroy;
-	object_class->set_arg = e_summary_titlebar_set_arg;
-	object_class->get_arg = e_summary_titlebar_get_arg;
-	
-	item_class->realize = e_summary_titlebar_realize;
-	item_class->unrealize = e_summary_titlebar_unrealize;
-	item_class->event = e_summary_titlebar_event;
-	item_class->point = e_summary_titlebar_point;
-	
-	gtk_object_add_arg_type ("ESummaryTitlebar::text",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE,
-				 ARG_TEXT);
-	gtk_object_add_arg_type ("ESummaryTitlebar::width",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,
-				 ARG_WIDTH);
-	gtk_object_add_arg_type ("ESummaryTitlebar::height",
-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE,
-				 ARG_HEIGHT);
-	
-	titlebar_signals[EDIT] = gtk_signal_new ("edit", GTK_RUN_LAST,
-						 object_class->type,
-						 GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								    edit),
-						 gtk_marshal_NONE__NONE,
-						 GTK_TYPE_NONE, 0);
-	titlebar_signals[SHADE] = gtk_signal_new ("shade", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     shade),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	titlebar_signals[CLOSE] = gtk_signal_new ("close", GTK_RUN_LAST,
-						  object_class->type,
-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,
-								     close),
-						  gtk_marshal_NONE__NONE,
-						  GTK_TYPE_NONE, 0);
-	gtk_object_class_add_signals (object_class, titlebar_signals,
-				      LAST_SIGNAL);
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-}
-
-static void
-e_summary_titlebar_init (GtkObject *object)
-{
-	ESummaryTitlebar *titlebar;
-	ESummaryTitlebarPrivate *priv;
-	
-	titlebar = E_SUMMARY_TITLEBAR (object);
-	titlebar->private = g_new0 (ESummaryTitlebarPrivate, 1);
-	priv = titlebar->private;
-	
-	priv->width = 100.0;
-	priv->text = NULL;
-	
-	gdk_rgb_init ();
-}
-
-E_MAKE_TYPE (e_summary_titlebar, "ESummaryTitlebar", ESummaryTitlebar,
-	     e_summary_titlebar_class_init, e_summary_titlebar_init,
-	     PARENT_TYPE);
-
diff --git a/executive-summary/widgets/e-summary-titlebar.h b/executive-summary/widgets/e-summary-titlebar.h
deleted file mode 100644
index b748a4dc8b..0000000000
--- a/executive-summary/widgets/e-summary-titlebar.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-summary-titlebar.h
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef _E_SUMMARY_TITLEBAR_H__
-#define _E_SUMMARY_TITLEBAR_H__
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#define E_SUMMARY_TITLEBAR_TYPE (e_summary_titlebar_get_type ())
-#define E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebar))
-#define E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebarClass))
-#define IS_E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-#define IS_E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))
-
-typedef struct _ESummaryTitlebarPrivate ESummaryTitlebarPrivate;
-typedef struct _ESummaryTitlebar ESummaryTitlebar;
-typedef struct _ESummaryTitlebarClass ESummaryTitlebarClass;
-
-struct _ESummaryTitlebar {
-  GnomeCanvasGroup parent;
-
-  ESummaryTitlebarPrivate *private;
-};
-
-struct _ESummaryTitlebarClass {
-  GnomeCanvasGroupClass parent_class;
-
-  void (*close) (ESummaryTitlebar *window);
-  void (*shade) (ESummaryTitlebar *window);
-  void (*edit) (ESummaryTitlebar *window);
-};
-
-GtkType e_summary_titlebar_get_type (void);
-
-#endif
diff --git a/executive-summary/widgets/edit.xpm b/executive-summary/widgets/edit.xpm
deleted file mode 100644
index 7f2deb1525..0000000000
--- a/executive-summary/widgets/edit.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * edit_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-"              ",
-"     ...      ",
-"    .   .     ",
-"    .   .     ",
-"        .     ",
-"        .     ",
-"      ..      ",
-"      ..      ",
-"      ..      ",
-"              ",
-"      ..      ",
-"      ..      ",
-"              "};
diff --git a/executive-summary/widgets/esummary-window-test.c b/executive-summary/widgets/esummary-window-test.c
deleted file mode 100644
index 3a0ad0ab6b..0000000000
--- a/executive-summary/widgets/esummary-window-test.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-summary-subwindow.h"
-#include "e-summary-titlebar.h"
-
-void
-close_test (GtkWidget *widget,
-	    gpointer data)
-{
-  gtk_main_quit ();
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  GtkWidget *window, *canvas;
-  ESummarySubwindow *subwindow;
-  GtkWidget *control;
-
-  gnome_init ("Executive Summary Subwindow Test", "1.0", argc, argv);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-		      GTK_SIGNAL_FUNC (close_test), NULL);
-
-  canvas = e_canvas_new ();
-
-  subwindow = e_summary_subwindow_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas)->root), 100, 100);
-
-  control = gtk_button_new_with_label ("A big button");
-  gtk_widget_set_usize (control, 400, 200);
-
-  e_summary_subwindow_add (subwindow, control); 
-  gtk_widget_show (control);
-
-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 1000.0, 1300.0); 
-  gtk_container_add (GTK_CONTAINER (window), canvas);
-  gtk_widget_show_all (window);
-
-  gtk_main ();
-
-  exit(0);
-}
diff --git a/executive-summary/widgets/shade.xpm b/executive-summary/widgets/shade.xpm
deleted file mode 100644
index 349212e906..0000000000
--- a/executive-summary/widgets/shade.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * shade_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ............ ",
-" ............ ",
-" ............ ",
-" ............ ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" .          . ",
-" ............ ",
-"              "};
diff --git a/executive-summary/widgets/x.xpm b/executive-summary/widgets/x.xpm
deleted file mode 100644
index ce9e9f19dc..0000000000
--- a/executive-summary/widgets/x.xpm
+++ /dev/null
@@ -1,19 +0,0 @@
-/* XPM */
-static char * x_xpm[] = {
-"14 14 2 1",
-" 	g None",
-".	g #000000",
-"              ",
-" ..        .. ",
-" ...      ... ",
-"  ...    ...  ",
-"   ...  ...   ",
-"    ......    ",
-"     ....     ",
-"     ....     ",
-"    ......    ",
-"   ...  ...   ",
-"  ...    ...  ",
-" ...      ... ",
-" ..        .. ",
-"              "};