Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22964

1 files changed, 0 insertions, 82 deletions

diff --git a/shell/Evolution-Shell.idl b/shell/Evolution-Shell.idl
index 20960ce029..dd3f44838c 100644
--- a/shell/Evolution-Shell.idl
+++ b/shell/Evolution-Shell.idl
@@ -12,10 +12,6 @@
 
 module GNOME {
 module Evolution {
-	interface ShellComponent;
-
-	interface FolderSelectionListener;
-
 	interface Shell : Bonobo::Unknown {
 		exception NotReady {};
 		exception NotFound {};
@@ -24,34 +20,6 @@ module Evolution {
 		exception InternalError {};
 		exception Busy {};
 
-		typedef sequence<string> FolderTypeNameList;
-
-		/**
-		 * getComponentByType:
-		 * @type: name of a valid folder type
-		 *
-		 * Get the shell component associated with a specific folder type.
-		 *
-		 * Return value: the Evolution::ShellComponent interface for the component that
-		 * handles @type.
-		 */
-		ShellComponent getComponentByType (in string type)
-			raises (NotReady, NotFound);
-
-		/**
-		 * getIconByType:
-		 * @type: name of a valid folder type
-		 * @mini: whether or not to get a mini (16x16) icon
-		 *
-		 * Get an icon associated with a specific folder type.
-		 *
-		 * Return value: an Evolution::Icon interface for the
-		 * component that handles @type.
-		 */
-		Icon getIconByType (in string  type,
-				    in boolean mini)
-			raises (NotReady, NotFound);
-
 		/**
 		 * createNewView:
 		 * @uri: URI for the view to open
@@ -74,51 +42,6 @@ module Evolution {
 			raises (NotReady, NotFound, UnsupportedSchema, InvalidURI, InternalError);
 
 		/**
-		 * selectUserFolder:
-		 * @parent_xid: XID for the parent window (or zero if no parent window).
-		 * @listener: a listener interface to report the answer of the user.
-		 * @title: title for the folder selector dialog
-		 * @default_folder: physical or `evolution:' URI for the folder that must be
-		 * selected by default, when the dialog is popped up
-		 * @possible_types: list of the names of the types of folders that are allowed
-		 *
-		 * Pop up a folder selection dialog from which the user can select a folder.
-		 * Initially, the @default_folder is selected.  The user can also create a new
-		 * folder by using the "New..." button.  The dialog only lets the user choose
-		 * a folder whose type is listed in @possible_types.
-		 */
-		void selectUserFolder (in long long parent_xid,
-				       in FolderSelectionListener listener,
-				       in string title,
-				       in string default_folder,
-				       in FolderTypeNameList possible_types)
-			raises (NotReady, Busy);
-
-		/**
-		 * getLocalStorage:
-		 *
-		 * Get the interface to the local storage.
-		 *
-		 * FIXME: Probably we just want to be able to request this to
-		 * the StorageRegistry.  This is an ugly kludge.
-		 *
-		 * Return value: the `Evolution::LocalStorage' interface for
-		 * the local storage.  */
-		Storage getLocalStorage ()
-			raises (NotReady);
-
-		/**
-		 * createStorageSetView:
-		 *
-		 * Create a control for the storage set view.  This control
-		 * will also implement the `Evolution::StorageSetView' interface.
-		 *
-		 * Return value: the newly created control.
-		 */
-		Bonobo::Control createStorageSetView ()
-			raises (NotReady);
-
-		/**
 		 * setLineStatus:
 		 *
 		 * Set the shell into on-line or off-line mode.
@@ -126,10 +49,5 @@ module Evolution {
 		void setLineStatus (in boolean online)
 			raises (NotReady);
 	};
-
-	interface FolderSelectionListener {
-		void notifySelected (in Folder folder);
-		void notifyCanceled ();
-	};
 };
 };