From eca687589d106ff87cd4fca7bf581cb0532caf96 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 5 Sep 2008 15:47:38 +0000
Subject: Saving progress.  Lots of changes.  Things are a bit broken at the
 moment.

svn path=/branches/kill-bonobo/; revision=36260
---
 shell/e-shell-window-private.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'shell/e-shell-window-private.h')

diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index db8174832d..81bf254c61 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,11 +28,11 @@
 #include <e-shell.h>
 #include <e-shell-view.h>
 #include <e-shell-registry.h>
+#include <e-shell-switcher.h>
 #include <e-shell-window-actions.h>
 
 #include <e-menu-tool-button.h>
 #include <e-online-button.h>
-#include <e-sidebar.h>
 
 #define E_SHELL_WINDOW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -58,11 +58,13 @@ struct _EShellWindowPrivate {
 
 	/*** UI Management ***/
 
-	GtkUIManager *manager;
+	GtkUIManager *ui_manager;
 	GtkActionGroup *shell_actions;
+	GtkActionGroup *gal_view_actions;
 	GtkActionGroup *new_item_actions;
 	GtkActionGroup *new_source_actions;
 	GtkActionGroup *shell_view_actions;
+	guint gal_view_merge_id;
 
 	/*** Shell Views ***/
 
@@ -77,8 +79,8 @@ struct _EShellWindowPrivate {
 	GtkWidget *menu_tool_button;
 	GtkWidget *content_pane;
 	GtkWidget *content_notebook;
-	GtkWidget *sidebar;
 	GtkWidget *sidebar_notebook;
+	GtkWidget *switcher;
 	GtkWidget *status_area;
 	GtkWidget *online_button;
 	GtkWidget *tooltip_label;
@@ -100,6 +102,8 @@ void		e_shell_window_actions_init	(EShellWindow *shell_window);
 GtkWidget *	e_shell_window_create_new_menu	(EShellWindow *shell_window);
 void		e_shell_window_create_shell_view_actions
 						(EShellWindow *shell_window);
+void		e_shell_window_update_gal_view_menu
+						(EShellWindow *shell_window);
 
 G_END_DECLS
 
-- 
cgit