Evolution-Component.idl Evolution-Shell.idl Remove duplicate definitions

2005-12-22  Parthasarathi Susarla <sparthasarathi@novell.com>

	* Evolution-Component.idl
	* Evolution-Shell.idl
	* Evolution.idl:
	Remove duplicate definitions and circular dependencies.

	* e-shell.c: comment out the implementation for findComponent.
	If implemented, this creates a circular dependency between the
	Shell.idl and Component.idl.
	** This is just a work-around **
Evolution-Component.idl Evolution-Shell.idl CVS: 	Evolution.idl
e-shell-view.c e-shell.c CVS:
----------------------------------------------------------------------

svn path=/trunk/; revision=30934

6 files changed, 18 insertions, 109 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index cd5e5ac61a..0edec5bb65 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-22  Parthasarathi Susarla <sparthasarathi@novell.com>
+	
+	* Evolution-Component.idl
+	* Evolution-Shell.idl
+	* Evolution.idl:
+	Remove duplicate definitions and circular dependencies.
+	
+	* e-shell.c: comment out the implementation for findComponent. 
+	If implemented, this creates a circular dependency between the
+	Shell.idl and Component.idl. 
+	** This is just a work-around **
+
 2005-12-22  Shreyas Srinivasan <sshreyas@novell.com>
 
 	* Network Manager Support for shell
diff --git a/shell/Evolution-Component.idl b/shell/Evolution-Component.idl
index e0c486a630..8f52fa95ba 100644
--- a/shell/Evolution-Component.idl
+++ b/shell/Evolution-Component.idl
@@ -53,12 +53,6 @@ module Evolution {
 				  out Bonobo::Control statusbar_control);
 	};
 
-	interface ComponentView : Bonobo::Unknown {
-		void getControls (out Bonobo::Control sidebar_control,
-				  out Bonobo::Control view_control,
-				  out Bonobo::Control statusbar_control);
-	};
-
 	interface Listener : Bonobo::Unknown {
 		/* Indicate the change of state is complete */
 		void complete();
@@ -84,7 +78,6 @@ module Evolution {
 		ComponentView createView(in ShellView parent)
 			raises (Failed);
 
-		/* Create the controls for embedding in the shell.  */
 
 		/* Check if the component can quit.
 		   Do not perform any quit-related tasks however.
diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl
index b67aee1151..c5999c9776 100644
--- a/shell/Evolution-Shell.idl
+++ b/shell/Evolution-Shell.idl
@@ -15,34 +15,7 @@
 
 module GNOME {
 module Evolution {
-	enum CreatableItem {
-		CREATABLE_OBJECT,
-		CREATABLE_FOLDER
-	};
-
-	/* A type of item that the component can create when asked by the user,
-	   e.g. a mail message or an appointment.  */
-	struct CreatableItemType {
-		string id;
-		string description;
-		string menuDescription;
-		string tooltip;
-		char menuShortcut;
-		string iconName;
-		CreatableItem type;
-	};
-	typedef sequence <CreatableItemType> CreatableItemTypeList;
 
-	interface ComponentView : Bonobo::Unknown {
-		void getControls (out Bonobo::Control sidebar_control,
-				  out Bonobo::Control view_control,
-				  out Bonobo::Control statusbar_control);
-	};
-
-	interface Listener : Bonobo::Unknown {
-		/* Indicate the change of state is complete */
-		void complete();
-	};
 
 	interface ShellView : Bonobo::Unknown {
 		/* Should really use a ComponentView i guess */
@@ -50,74 +23,6 @@ module Evolution {
 		void setComponent(in string component);
 	};
 
-	interface Component : Bonobo::Unknown {
-		exception Failed {};
-		exception UnknownType {};
-		/* We don't know about the old version we're upgrading from */
-		exception UnsupportedVersion {};
-		/* We encountered a non-recoverable, fatal error, explain why */
-		exception UpgradeFailed {
-			string what;
-			string why;
-		};
-
-		/*** Upgrade path.  ***/
-
-		void upgradeFromVersion (in short major, in short minor, in short revision)
-			raises (UnsupportedVersion, UpgradeFailed);
-
-		/*** Basic functionality.  ***/
-		ComponentView createView(in ShellView parent)
-			raises (Failed);
-
-		/* Create the controls for embedding in the shell.  */
-
-		/* Check if the component can quit.
-		   Do not perform any quit-related tasks however.
-		   May be called multiple times, depending on user interaction. */
-		boolean requestQuit ();
-
-		/* Ask the component to quit.  Returns TRUE when the
-		   component has completed any closing-down tasks, and
-		   is ready to exit().  This will be called repeatedly
-		   at intervals until it returns TRUE. */
-		boolean quit ();
-
-		/* Notify the component of whether the shell is currently
-		   running in interactive mode or not.  (I.e. basically,
-		   whether there are any Evolution windows on the screen.)
-		   @new_view_xid is an X Window ID ("None" if @now_interactive
-		   is FALSE) */
-		void interactive (in boolean now_interactive,
-				  in unsigned long new_view_xid);
-
-
-		/*** The following stuff is needed to build the "New" toolbar
-                     item as well as the "File -> New" submenu.  ***/
-
-		/* List of creatable items. */
-		readonly attribute CreatableItemTypeList userCreatableItems;
-
-		/* Pop up a new editing dialog for the item with the specified
-		   @item_type_name.  */
-		void requestCreateItem (in string item_type_name)
-			raises (UnknownType, Failed);
-
-
-		/*** URI handling (e.g. for the command-line, "evolution
-		     mailto:foo@bar.org")  ***/
-		void handleURI (in string uri);
-
-
-		/*** Send/receive.  ***/
-
-		void sendAndReceive ();
-
-		/* Set the online status of the component asynchronously */
-
-		void setLineStatus(in boolean online, in Listener listener);
-	};
-
 	interface Shell : Bonobo::Unknown {
 		exception Busy {};
 		exception ComponentNotFound {};
@@ -158,8 +63,8 @@ module Evolution {
 		/*
 		 * Lookup a component by id.
 		 */
-		Component findComponent(in string id)
-			raises (NotReady, ComponentNotFound);
+		/*Component findComponent(in string id)
+			raises (NotReady, ComponentNotFound);*/
 	};
 };
 };
diff --git a/shell/Evolution.idl b/shell/Evolution.idl
index 167caa258b..059d017444 100644
--- a/shell/Evolution.idl
+++ b/shell/Evolution.idl
@@ -15,5 +15,6 @@
 
 #include <Evolution-ConfigControl.idl>
 #include <Evolution-Shell.idl>
+#include <Evolution-Component.idl>
 
 #endif
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index e5a749801e..5ed35482ad 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -45,8 +45,6 @@ impl_ShellView_setTitle(PortableServer_Servant _servant, const CORBA_char *id, c
 	EShellView *esw = (EShellView *)bonobo_object_from_servant(_servant);
 	char *tmp = g_strdup_printf("Evolution - %s", title);
 
-	printf("shell view:setTitle '%s'\n", title);
-
 	e_shell_window_set_title(esw->window, id, tmp);
 	g_free(tmp);
 }
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 4fac50f646..affa0df9d7 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -315,7 +315,7 @@ impl_Shell_setLineStatus (PortableServer_Servant servant,
 	else
 		e_shell_go_offline (shell, NULL, GNOME_Evolution_USER_OFFLINE);
 }
-
+/*
 static GNOME_Evolution_Component
 impl_Shell_findComponent(PortableServer_Servant servant,
 			 const CORBA_char *id,
@@ -339,7 +339,7 @@ impl_Shell_findComponent(PortableServer_Servant servant,
 		return ci->iface;
 	}
 }
-
+*/
 
 /* EShellWindow handling and bookkeeping.  */
 
@@ -527,7 +527,7 @@ e_shell_class_init (EShellClass *klass)
 	epv->createNewWindow = impl_Shell_createNewWindow;
 	epv->handleURI       = impl_Shell_handleURI;
 	epv->setLineStatus   = impl_Shell_setLineStatus;
-	epv->findComponent   = impl_Shell_findComponent;
+/*	epv->findComponent   = impl_Shell_findComponent;*/
 }
 
 static void