[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, 16 insertions, 0 deletions

diff --git a/shell/e-storage.c b/shell/e-storage.c
index 0b2734252e..b6219605ab 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -178,6 +178,12 @@ impl_get_name (EStorage *storage)
 	return _("(No name)");
 }
 
+static const char *
+impl_get_display_name (EStorage *storage)
+{
+	return _("(No name)");
+}
+
 static void
 impl_async_create_folder (EStorage *storage,
 			  const char *path,
@@ -225,6 +231,7 @@ class_init (EStorageClass *class)
 	class->get_subfolder_paths = impl_get_subfolder_paths;
 	class->get_folder          = impl_get_folder;
 	class->get_name            = impl_get_name;
+	class->get_display_name    = impl_get_display_name;
 	class->async_create_folder = impl_async_create_folder;
 	class->async_remove_folder = impl_async_remove_folder;
 	class->async_xfer_folder   = impl_async_xfer_folder;
@@ -356,6 +363,15 @@ e_storage_get_name (EStorage *storage)
 	return (* ES_CLASS (storage)->get_name) (storage);
 }
 
+const char *
+e_storage_get_display_name (EStorage *storage)
+{
+	g_return_val_if_fail (storage != NULL, NULL);
+	g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
+
+	return (* ES_CLASS (storage)->get_display_name) (storage);
+}
+
 /**
  * e_storage_get_toplevel_node_uri:
  * @storage: A pointer to an EStorage object