4 files changed, 28 insertions, 69 deletions

diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl
index ac3809e299..a564e90fe6 100644
--- a/executive-summary/idl/Executive-Summary.idl
+++ b/executive-summary/idl/Executive-Summary.idl
@@ -1,3 +1,4 @@
 #include <Bonobo.idl>
 #include <SummaryComponent.idl>
 #include <Summary.idl>
+#include <HtmlView.idl>
diff --git a/executive-summary/idl/HtmlView.idl b/executive-summary/idl/HtmlView.idl
new file mode 100644
index 0000000000..0116fbf9b8
--- /dev/null
+++ b/executive-summary/idl/HtmlView.idl
@@ -0,0 +1,23 @@
+/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * CORBA interface for an HTML view.
+ *
+ * Authors:
+ *   Iain Holmes  <iain@helixcode.com> 
+ *
+ * Copyright (C) 2000 Helix Code, Inc.
+ */
+
+#include <Bonobo.idl>
+
+module GNOME {
+module Evolution {
+module Summary {
+
+	interface HTMLView : Bonobo::Unknown{
+		string getHtml ();
+	};
+};
+};
+};
+
diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl
index 04b89187e0..118a0788d9 100644
--- a/executive-summary/idl/Summary.idl
+++ b/executive-summary/idl/Summary.idl
@@ -14,44 +14,6 @@ module GNOME {
 module Evolution {
 module Summary {
 	interface ViewFrame: Bonobo::Unknown {
-		exception NoSubWindow {};
-		
-		/**
-		 * setTitle:
-		 * @component: The SummaryComponent whose window to set the title.
-		 * @title: The title.
-		 *
-		 * Sets the title of the subwindow that displays @component
-		 * to @title
-		 */
-		void setTitle (in long id, 
-			       in string title)
-			raises (NoSubWindow);
-
-		void setIcon (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);
-
-		/**
-		 * updateComponent:
-		 * @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 updateComponent (in long id,
-				      in string html)
-			raises (NoSubWindow);
 	};
 };
 };
diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl
index fbfd58800a..1129721a02 100644
--- a/executive-summary/idl/SummaryComponent.idl
+++ b/executive-summary/idl/SummaryComponent.idl
@@ -11,6 +11,7 @@
 /* TODO: Needs Exceptions */
 
 #include <Bonobo.idl>
+#include <oaf-factory.idl>
 
 module GNOME {
 module Evolution {
@@ -33,38 +34,10 @@ module Summary {
 		 * Unsets the owner of the component.
 		 */
 		void unsetOwner ();
+	};
 
-		/**
-		 * createView:
-		 * @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 createView (in long id,
-				 out Bonobo::Control control,
-				 out string html,
-				 out string title,
-				 out string icon);
-
-		/**
-		 * destroyView:
-		 * @id: ID of the view to be destroyed.
-		 *
-		 * Tells a service that a view has been destroyed.
-		 */
-		void destroyView (in long id);
-
-		/**
-		 * configure:
-		 * 
-		 * Instructs the component to open a preferences dialog.
-		 */
-		void configure ();
-
+	interface ComponentFactory: Bonobo::Unknown {
+		Component createView ();
 	};
 };
 };