diff options
| author | Dan Winship <danw@src.gnome.org> | 2002-03-07 07:36:27 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2002-03-07 07:36:27 +0800 |
| commit | 3bc843ceb5bd66288077a4f8db1b6cdb7123f298 (patch) | |
| tree | 817b2e6a36eb70827ed8e7941fd582d9bfd2cbfc /shell/e-shell-importer.c | |
| parent | a3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc (diff) | |
| download | gsoc2013-evolution-3bc843ceb5bd66288077a4f8db1b6cdb7123f298.tar.gz gsoc2013-evolution-3bc843ceb5bd66288077a4f8db1b6cdb7123f298.tar.zst gsoc2013-evolution-3bc843ceb5bd66288077a4f8db1b6cdb7123f298.zip | |
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
Diffstat (limited to 'shell/e-shell-importer.c')
| -rw-r--r-- | shell/e-shell-importer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index c6e2bac359..54012965ab 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -46,7 +46,7 @@ #include "e-shell.h" #include "e-shell-view.h" -#include "e-local-storage.h" /* for E_LOCAL_STORAGE_NAME */ +#include "e-shell-constants.h" #include "e-shell-folder-selection-dialog.h" #include "importer/evolution-importer-client.h" |