[This is a better way to have "Local Folders" be shown as the local

2001-07-20  Jason Leach  <jleach@ximian.com>

        [This is a better way to have "Local Folders" be shown as the
        local storage name without breaking current user's shortcuts.]

        * e-corba-storage.c (get_display_name): Implement this, but it's
	only returning the real name now.  Need to change the IDL soon to
	let corba storages have separated display names.

        * e-shortcuts.c (e_shortcuts_add_default_group): Set these default
	shortcut URI's back to evolution:/local/

        * e-shell-view.h (DEFAULT_URI): Set this back to
	"evolution:/local/Inbox"

        * e-storage-set-view.c (etree_value_at): Get the display name for
	a storage rather than it's true name.

        * e-local-storage.c (impl_get_display_name): Implemented for the
	local folder (to return a translated "Local Folders").

        * e-storage.c (e_storage_get_display_name): New virtual function
        for retrieving the display name.

svn path=/trunk/; revision=11274

1 files changed, 15 insertions, 0 deletions

diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index d5faec2c72..b642848107 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -267,6 +267,20 @@ get_name (EStorage *storage)
 	return priv->name;
 }
 
+static const char *
+get_display_name (EStorage *storage)
+{
+	ECorbaStorage *corba_storage;
+	ECorbaStoragePrivate *priv;
+
+	corba_storage = E_CORBA_STORAGE (storage);
+	priv = corba_storage->priv;
+
+	/* FIXME: Abstract a display_name, return it.  Necessary
+           changes to the IDL and EvolutionStorage required. */
+	return priv->name;
+}
+
 struct async_folder_closure {
 	EStorageResultCallback callback;
 	EStorage *storage;
@@ -440,6 +454,7 @@ class_init (ECorbaStorageClass *klass)
 
 	storage_class = E_STORAGE_CLASS (klass);
 	storage_class->get_name = get_name;
+	storage_class->get_display_name = get_display_name;
 	storage_class->async_create_folder = async_create_folder;
 	storage_class->async_remove_folder = async_remove_folder;