Progress update:

  - Discard libnm-glib method of monitoring network connectivity.
  - Decided to make EShell a singleton GObject after all.  Makes the
    design cleaner, despite having to pass a singleton instance around.
  - Make the switcher button style persistent.


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

1 files changed, 4 insertions, 12 deletions

diff --git a/shell/e-shell-module.h b/shell/e-shell-module.h
index c1bbf6b594..f92c849af7 100644
--- a/shell/e-shell-module.h
+++ b/shell/e-shell-module.h
@@ -22,7 +22,7 @@
 #define E_SHELL_MODULE_H
 
 #include "e-shell-common.h"
-#include "e-shell-window.h"
+#include "e-shell.h"
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_MODULE \
@@ -58,11 +58,6 @@ struct _EShellModuleInfo {
 
 	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 {
@@ -75,17 +70,14 @@ struct _EShellModuleClass {
 };
 
 GType		e_shell_module_get_type		(void);
-EShellModule *	e_shell_module_new		(const gchar *filename);
+EShellModule *	e_shell_module_new		(EShell *shell,
+						 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);
+EShell *	e_shell_module_get_shell	(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,
-						 const gchar *uri);
-void		e_shell_module_send_and_receive	(EShellModule *shell_module);
-void		e_shell_module_window_created	(EShellModule *shell_module,
-						 EShellWindow *shell_window);
 void		e_shell_module_set_info		(EShellModule *shell_module,
 						 const EShellModuleInfo *info);