Define a new interface called EMailReader, which implements operations

common to both the main shell window and the message browser.  Replaces
EMFolderView.  Also begin to define EMailBrowser (GtkWindow subclass),
which implements EMailReader and replaces EMMessageBrowser.

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

2 files changed, 44 insertions, 1 deletions

diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 9c5ff2b8bb..16c90b6e4e 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -59,6 +59,7 @@ enum {
 	PROP_PAGE_NUM,
 	PROP_TITLE,
 	PROP_SHELL_CONTENT,
+	PROP_SHELL_MODULE,
 	PROP_SHELL_SIDEBAR,
 	PROP_SHELL_TASKBAR,
 	PROP_SHELL_WINDOW,
@@ -231,6 +232,11 @@ shell_view_get_property (GObject *object,
 				E_SHELL_VIEW (object)));
 			return;
 
+		case PROP_SHELL_MODULE:
+			g_value_set_object (
+				value, e_shell_view_get_shell_module (
+				E_SHELL_VIEW (object)));
+
 		case PROP_SHELL_SIDEBAR:
 			g_value_set_object (
 				value, e_shell_view_get_shell_sidebar (
@@ -446,6 +452,21 @@ shell_view_class_init (EShellViewClass *class)
 			G_PARAM_READABLE));
 
 	/**
+	 * EShellView::shell-module
+	 *
+	 * The #EShellModule for this shell view.
+	 **/
+	g_object_class_install_property (
+		object_class,
+		PROP_SHELL_MODULE,
+		g_param_spec_object (
+			"shell-module",
+			_("Shell Module"),
+			_("The EShellModule for this shell view"),
+			E_TYPE_SHELL_MODULE,
+			G_PARAM_READABLE));
+
+	/**
 	 * EShellView:shell-sidebar
 	 *
 	 * The sidebar widget appears in an #EShellWindow<!-- -->'s
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index b79417f7ea..af08f4cc4e 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -32,7 +32,8 @@ enum {
 	PROP_0,
 	PROP_ACTIVE_VIEW,
 	PROP_SAFE_MODE,
-	PROP_SHELL
+	PROP_SHELL,
+	PROP_UI_MANAGER
 };
 
 static gpointer parent_class;
@@ -195,6 +196,12 @@ shell_window_get_property (GObject *object,
 				value, e_shell_window_get_shell (
 				E_SHELL_WINDOW (object)));
 			return;
+
+		case PROP_UI_MANAGER:
+			g_value_set_object (
+				value, e_shell_window_get_ui_manager (
+				E_SHELL_WINDOW (object)));
+			return;
 	}
 
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -285,6 +292,21 @@ shell_window_class_init (EShellWindowClass *class)
 			E_TYPE_SHELL,
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
+
+	/**
+	 * EShellWindow:ui-manager
+	 *
+	 * The shell window's #GtkUIManager.
+	 **/
+	g_object_class_install_property (
+		object_class,
+		PROP_UI_MANAGER,
+		g_param_spec_object (
+			"ui-manager",
+			_("UI Manager"),
+			_("The shell window's GtkUIManager"),
+			GTK_TYPE_UI_MANAGER,
+			G_PARAM_READABLE));
 }
 
 static void