Saving progress. Experimenting with directory layout.

Saving progress.
Experimenting with directory layout.

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

1 files changed, 20 insertions, 20 deletions

diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 422101d549..a316fd7680 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -347,7 +347,23 @@ e_shell_window_new (EShell *shell,
 }
 
 /**
- * e_shell_window_get_view:
+ * e_shell_window_get_shell:
+ * @shell_window: an #EShellWindow
+ *
+ * Returns the #EShell that was passed to e_shell_window_new().
+ *
+ * Returns: the #EShell
+ **/
+EShell *
+e_shell_window_get_shell (EShellWindow *shell_window)
+{
+	g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL);
+
+	return shell_window->priv->shell;
+}
+
+/**
+ * e_shell_window_get_shell_view:
  * @shell_window: an #EShellWindow
  * @view_name: name of a shell view
  *
@@ -363,8 +379,8 @@ e_shell_window_new (EShell *shell,
  *          registered
  **/
 gpointer
-e_shell_window_get_view (EShellWindow *shell_window,
-                         const gchar *view_name)
+e_shell_window_get_shell_view (EShellWindow *shell_window,
+                               const gchar *view_name)
 {
 	GHashTable *loaded_views;
 	EShellView *shell_view;
@@ -410,22 +426,6 @@ e_shell_window_get_view (EShellWindow *shell_window,
 }
 
 /**
- * e_shell_window_get_shell:
- * @shell_window: an #EShellWindow
- *
- * Returns the #EShell that was passed to e_shell_window_new().
- *
- * Returns: the #EShell
- **/
-EShell *
-e_shell_window_get_shell (EShellWindow *shell_window)
-{
-	g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), NULL);
-
-	return shell_window->priv->shell;
-}
-
-/**
  * e_shell_window_get_ui_manager:
  * @shell_window: an #EShellWindow
  *
@@ -590,7 +590,7 @@ e_shell_window_set_active_view (EShellWindow *shell_window,
 	g_return_if_fail (E_IS_SHELL_WINDOW (shell_window));
 	g_return_if_fail (view_name != NULL);
 
-	shell_view = e_shell_window_get_view (shell_window, view_name);
+	shell_view = e_shell_window_get_shell_view (shell_window, view_name);
 	g_return_if_fail (shell_view != NULL);
 
 	action = e_shell_view_get_action (shell_view);