Committing the day's progress.

Realized the "New" menu construction algorithm needs to live independently of
shell view instances since we lazy load the shell views but have to display
all possible "New" items immediately.

Prototype the mechanisms for managing the various shell views and keeping
track of which one is current.

Various other tightening up and rethinking of APIs.

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

1 files changed, 9 insertions, 8 deletions

diff --git a/shell/e-shell-module.h b/shell/e-shell-module.h
index 7ea9dee4ef..c1bbf6b594 100644
--- a/shell/e-shell-module.h
+++ b/shell/e-shell-module.h
@@ -51,16 +51,18 @@ typedef struct _EShellModuleClass EShellModuleClass;
 typedef struct _EShellModulePrivate EShellModulePrivate;
 
 struct _EShellModuleInfo {
-	gint sort_order;
+	const gchar *name;
 	const gchar *aliases;   /* colon-separated list */
 	const gchar *schemes;   /* colon-separated list */
-	GType shell_view_type;  /* EShellView subclass  */
+	gint sort_order;
 
-	gboolean	(*is_busy)		(void);
-	gboolean	(*shutdown)		(void);
-	gboolean	(*handle_uri)		(const gchar *uri);
-	void		(*send_and_receive)	(void);
-	void		(*window_created)	(EShellWindow *window);
+	gboolean	(*is_busy)		(EShellModule *shell_module);
+	gboolean	(*shutdown)		(EShellModule *shell_module);
+	gboolean	(*handle_uri)		(EShellModule *shell_module,
+						 const gchar *uri);
+	void		(*send_and_receive)	(EShellModule *shell_module);
+	void		(*window_created)	(EShellModule *shell_module,
+						 EShellWindow *shell_window);
 };
 
 struct _EShellModule {
@@ -77,7 +79,6 @@ EShellModule *	e_shell_module_new		(const gchar *filename);
 gint		e_shell_module_compare		(EShellModule *shell_module_a,
 						 EShellModule *shell_module_b);
 const gchar *	e_shell_module_get_filename	(EShellModule *shell_module);
-GType		e_shell_module_get_view_type	(EShellModule *shell_module);
 gboolean	e_shell_module_is_busy		(EShellModule *shell_module);
 gboolean	e_shell_module_shutdown		(EShellModule *shell_module);
 gboolean	e_shell_module_handle_uri	(EShellModule *shell_module,