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, 1 deletions

diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index 2ff65138a8..f4f74f293b 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -22,6 +22,7 @@
 #define E_SHELL_WINDOW_H
 
 #include "e-shell-common.h"
+#include "e-shell.h"
 
 /* Standard GObject macros */
 #define E_TYPE_SHELL_WINDOW \
@@ -58,7 +59,9 @@ struct _EShellWindowClass {
 };
 
 GType		e_shell_window_get_type		(void);
-GtkWidget *	e_shell_window_new		(gboolean safe_mode);
+GtkWidget *	e_shell_window_new		(EShell *shell,
+						 gboolean safe_mode);
+EShell *	e_shell_window_get_shell	(EShellWindow *shell_window);
 GtkUIManager *	e_shell_window_get_ui_manager	(EShellWindow *shell_window);
 GtkAction *	e_shell_window_get_action	(EShellWindow *shell_window,
 						 const gchar *action_name);