From 3bc843ceb5bd66288077a4f8db1b6cdb7123f298 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 6 Mar 2002 23:36:27 +0000 Subject: 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 --- shell/e-shell-constants.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'shell/e-shell-constants.h') diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h index 00635161d0..ce21d5db8e 100644 --- a/shell/e-shell-constants.h +++ b/shell/e-shell-constants.h @@ -32,4 +32,7 @@ #define E_SHELL_ICON_SIZE 48 #define E_SHELL_MINI_ICON_SIZE 16 +#define E_LOCAL_STORAGE_NAME "local" +#define E_SUMMARY_STORAGE_NAME "summary" + #endif -- cgit v1.2.3