From 5350eebb5ef8c07e69110616ce1662e0e92bea16 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 8 Sep 2008 20:37:00 +0000
Subject: Progress update:

	- Merge ETaskBar into EShellTaskbar.
	- Remember the last view, and make --component work.


svn path=/branches/kill-bonobo/; revision=36278
---
 shell/e-shell-view.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'shell/e-shell-view.h')

diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index 5deeac0f31..1654b9c6c6 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -22,6 +22,9 @@
 #define E_SHELL_VIEW_H
 
 #include <e-shell-common.h>
+#include <e-shell-content.h>
+#include <e-shell-sidebar.h>
+#include <e-shell-taskbar.h>
 #include <e-shell-window.h>
 
 #include <gal-view-instance.h>
@@ -89,12 +92,12 @@ GalViewInstance *
 		e_shell_view_get_view_instance	(EShellView *shell_view);
 void		e_shell_view_set_view_instance	(EShellView *shell_view,
 						 GalViewInstance *instance);
-EShellWindow *	e_shell_view_get_window		(EShellView *shell_view);
+EShellWindow *	e_shell_view_get_shell_window	(EShellView *shell_view);
 gboolean	e_shell_view_is_selected	(EShellView *shell_view);
 gint		e_shell_view_get_page_num	(EShellView *shell_view);
-GtkWidget *	e_shell_view_get_content_widget	(EShellView *shell_view);
-GtkWidget *	e_shell_view_get_sidebar_widget	(EShellView *shell_view);
-GtkWidget *	e_shell_view_get_taskbar_widget	(EShellView *shell_view);
+EShellContent *	e_shell_view_get_content	(EShellView *shell_view);
+EShellSidebar *	e_shell_view_get_sidebar	(EShellView *shell_view);
+EShellTaskbar *	e_shell_view_get_taskbar	(EShellView *shell_view);
 void		e_shell_view_changed		(EShellView *shell_view);
 
 G_END_DECLS
-- 
cgit v1.2.3