diff options
| -rw-r--r-- | mail/ChangeLog | 4 | ||||
| -rw-r--r-- | mail/component-factory.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ba09dd6f11..8d76173f2d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,9 @@ 2001-03-08 Jeffrey Stedfast <fejj@ximian.com> + * component-factory.c: Add "vtrash" as a folder type we support. + (create_view): Kludgy-kludge around the vtrash type. + (owner_set_cb): Don't create the vTrash folder here anymore... + * folder-browser.c (on_double_click): Call open_msg here so that it does the Right Thing (tm). diff --git a/mail/component-factory.c b/mail/component-factory.c index 340b9b8c11..93e8ada015 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -43,7 +43,6 @@ #include "mail-mt.h" #include "mail-importer.h" #include "mail-vfolder.h" /* vfolder_create_storage */ -#include "mail-vtrash.h" #include "openpgp-utils.h" #include <gal/widgets/e-gui-utils.h> @@ -102,6 +101,8 @@ create_view (EvolutionShellComponent *shell_component, camel_object_unref (CAMEL_OBJECT (store)); control = folder_browser_factory_new_control ("", corba_shell); + } else if (g_strcasecmp (folder_type, "vtrash") == 0) { + control = folder_browser_factory_new_control ("vtrash:file:/", corba_shell); } else return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE; @@ -216,8 +217,6 @@ owner_set_cb (EvolutionShellComponent *shell_component, g_free (uri); } - mail_vtrash_create ("file:/", "vTrash"); - mail_session_enable_interaction (TRUE); mail_autoreceive_setup (); @@ -256,6 +255,7 @@ owner_unset_cb (EvolutionShellComponent *shell_component, gpointer user_data) static const EvolutionShellComponentFolderType folder_types[] = { { "mail", "evolution-inbox.png" }, { "mailstorage", "evolution-inbox.png" }, + { "vtrash", "evolution-inbox.png" }, { NULL, NULL } }; |