From b6e44f08f719efee9c6ed90813d03ddbf42e9121 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 20 Jan 2004 04:32:41 +0000 Subject: Make displayed_uid public. 2004-01-20 Not Zed * em-folder-view.c (EMFolderView): Make displayed_uid public. * em-folder-browser.c (em_folder_browser_show_preview): use em_folder_view_set_message rather than message_list_select_uid. When clearing, clear view->displayed_uid too. 2004-01-20 Not Zed ** See bug #52965. * mail-component.c (mail_component_init): removed an epfixme, it already is an object. (impl_upgradeFromVersion): call mail_note_store after running the upgrade for local folders. * em-migrate.c (em_migrate): revert the vfolders.xml after we've imported them. * mail-vfolder.c (vfolder_revert): new api to re-load the vfolders file. svn path=/trunk/; revision=24322 --- mail/mail-component.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'mail/mail-component.c') diff --git a/mail/mail-component.c b/mail/mail-component.c index 749fcbc3eb..ad6b728ad6 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -481,17 +481,21 @@ impl_upgradeFromVersion (PortableServer_Servant servant, short major, short mino { MailComponent *component; CamelException ex; - + int ok; + component = mail_component_peek (); camel_exception_init (&ex); - if (em_migrate (component->priv->base_directory, major, minor, revision, &ex) == -1) { - /* FIXME: report errors? */ - camel_exception_clear (&ex); - return FALSE; - } - - return TRUE; + ok = em_migrate (component->priv->base_directory, major, minor, revision, &ex) != -1; + + /* FIXME: report errors? */ + camel_exception_clear (&ex); + + /* This is a hack so that after importing new folders, they properly hook into vfolders, etc. + Perhaps the CamelLocalStore class should emit folder_created events for folders when opened */ + mail_note_store(component->priv->local_store, NULL, NULL, NULL); + + return ok; } /* Initialization. */ @@ -532,7 +536,6 @@ mail_component_init (MailComponent *component) priv->activity_handler = e_activity_handler_new (); - /* EPFIXME: Turn into an object? */ mail_session_init (priv->base_directory); priv->async_event = mail_async_event_new(); -- cgit v1.2.3