Keep the storage name and display_name in EStoragePriv. (impl_get_name,

	* e-storage.c: Keep the storage name and display_name in
	EStoragePriv.
	(impl_get_name, impl_get_display_name): Return them.
	(e_storage_construct): Set them here.
	(e_storage_new): And here.

	* e-local-storage.c: (impl_get_name, impl_get_display_name):
	Removed.
	(construct): Pass E_LOCAL_STORAGE_NAME and U_("Local Folders") to
	e_storage_construct.

	* e-corba-storage.c: Remove priv->name.
	(get_name, get_display_name): Removed.
	(e_corba_storage_construct): Pass name to e_storage_construct().

	* e-summary-storage.[ch]: Gone. This didn't override anything in
	EStorage but get_name/get_display_name, and the defaults for those
	DTRT now.

	* e-shell-constants.h: Move E_SUMMARY_STORAGE_NAME here from
	e-summary-storage.h, and move E_LOCAL_STORAGE_NAME too for
	consistency.

	* e-storage-set-view.c: Fix up #includes.

	* e-shell-importer.c: Likewise

	* e-shell.c: Likewise. Create summary_storage as a plain EStorage
	since ESummaryStorage is gone now.

	* Makefile.am (evolution_SOURCES): Remove e-summary-storage.[ch]

svn path=/trunk/; revision=15955

1 files changed, 4 insertions, 18 deletions

diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 97a26b5634..95175106ac 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -50,6 +50,7 @@
 #include <gal/util/e-unicode-i18n.h>
 #include "e-util/e-path.h"
 #include "e-local-folder.h"
+#include "e-shell-constants.h"
 
 #include "evolution-storage.h"
 
@@ -622,21 +623,6 @@ impl_destroy (GtkObject *object)
 }
 
 
-/* EStorage methods.  */
-
-static const char *
-impl_get_name (EStorage *storage)
-{
-	return E_LOCAL_STORAGE_NAME;
-}
-
-static const char *
-impl_get_display_name (EStorage *storage)
-{
-	return U_("Local Folders");
-}
-
-
 /* Creating folders.  */
 
 static void
@@ -1004,8 +990,6 @@ class_init (ELocalStorageClass *class)
 
 	object_class->destroy              = impl_destroy;
 
-	storage_class->get_name            = impl_get_name;
-	storage_class->get_display_name    = impl_get_display_name;
 	storage_class->async_create_folder = impl_async_create_folder;
 	storage_class->async_remove_folder = impl_async_remove_folder;
 	storage_class->async_xfer_folder   = impl_async_xfer_folder;
@@ -1034,7 +1018,9 @@ construct (ELocalStorage *local_storage,
 	ELocalStoragePrivate *priv;
 	int base_path_len;
 
-	e_storage_construct (E_STORAGE (local_storage), NULL, NULL);
+	e_storage_construct (E_STORAGE (local_storage),
+			     E_LOCAL_STORAGE_NAME, U_("Local Folders"),
+			     NULL, NULL);
 
 	priv = local_storage->priv;