4 files changed, 10 insertions, 19 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index c1c175d692..91aedf0d23 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-shell_content.c
+/* e-shell-content.c
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index e802523aee..13385d18b7 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-shell-shell_sidebar.c
+/* e-shell-sidebar.c
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index b12f4c86f2..5d14834721 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -372,14 +372,6 @@ e_shell_view_get_type (void)
 	return type;
 }
 
-GtkAction *
-e_shell_view_get_action (EShellView *shell_view)
-{
-	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
-
-	return shell_view->priv->action;
-}
-
 const gchar *
 e_shell_view_get_name (EShellView *shell_view)
 {
@@ -395,6 +387,14 @@ e_shell_view_get_name (EShellView *shell_view)
 	return g_object_get_data (G_OBJECT (action), "view-name");
 }
 
+GtkAction *
+e_shell_view_get_action (EShellView *shell_view)
+{
+	g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL);
+
+	return shell_view->priv->action;
+}
+
 const gchar *
 e_shell_view_get_title (EShellView *shell_view)
 {
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index cb4ffcfda0..ee41aade9e 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -77,15 +77,6 @@ struct _EShellViewClass {
 GType		e_shell_view_get_type		(void);
 const gchar *	e_shell_view_get_name		(EShellView *shell_view);
 GtkAction *	e_shell_view_get_action		(EShellView *shell_view);
-const gchar *	e_shell_view_get_icon_name	(EShellView *shell_view);
-void		e_shell_view_set_icon_name	(EShellView *shell_view,
-						 const gchar *icon_name);
-const gchar *	e_shell_view_get_primary_text	(EShellView *shell_view);
-void		e_shell_view_set_primary_text	(EShellView *shell_view,
-						 const gchar *primary_text);
-const gchar *	e_shell_view_get_secondary_text	(EShellView *shell_view);
-void		e_shell_view_set_secondary_text	(EShellView *shell_view,
-						 const gchar *secondary_text);
 const gchar *	e_shell_view_get_title		(EShellView *shell_view);
 void		e_shell_view_set_title		(EShellView *shell_view,
 						 const gchar *title);