aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.c
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-03-07 07:36:27 +0800
committerDan Winship <danw@src.gnome.org>2002-03-07 07:36:27 +0800
commit3bc843ceb5bd66288077a4f8db1b6cdb7123f298 (patch)
tree817b2e6a36eb70827ed8e7941fd582d9bfd2cbfc /shell/e-shell.c
parenta3dfdc714c2d3b4663c1d7f2b07daf6e8a8940dc (diff)
downloadgsoc2013-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.c')
-rw-r--r--shell/e-shell.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a22d255784..8b137adc68 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -45,6 +45,7 @@
#include <gal/widgets/e-gui-utils.h>
#include <gal/util/e-util.h>
+#include <gal/util/e-unicode-i18n.h>
#include "Evolution.h"
@@ -64,7 +65,6 @@
#include "e-shortcuts.h"
#include "e-storage-set.h"
#include "e-splash.h"
-#include "e-summary-storage.h"
#include "e-uri-schema-registry.h"
#include "evolution-storage-set-view-factory.h"
@@ -87,7 +87,7 @@ struct _EShellPrivate {
EStorageSet *storage_set;
ELocalStorage *local_storage;
- ESummaryStorage *summary_storage;
+ EStorage *summary_storage;
EShortcuts *shortcuts;
EFolderTypeRegistry *folder_type_registry;
@@ -657,8 +657,10 @@ setup_local_storage (EShell *shell)
e_storage_set_add_storage (priv->storage_set, local_storage);
priv->local_storage = E_LOCAL_STORAGE (local_storage);
- priv->summary_storage = E_SUMMARY_STORAGE (e_summary_storage_new ());
- e_storage_set_add_storage (priv->storage_set, E_STORAGE (priv->summary_storage));
+ priv->summary_storage = e_storage_new (E_SUMMARY_STORAGE_NAME,
+ U_("Summary"),
+ "/", "summary");
+ e_storage_set_add_storage (priv->storage_set, priv->summary_storage);
return TRUE;
}