diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2004-01-21 04:51:01 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-01-21 04:51:01 +0800 |
| commit | 12b2cfb7410fb091fde463332454dc8fce4f91c9 (patch) | |
| tree | f751695169c13e12dc0079d1c60a1b76783dd7e1 | |
| parent | eff4fec134c39fa372b28498885872d67f7d3ce2 (diff) | |
| download | gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar.gz gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar.bz2 gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar.lz gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar.xz gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.tar.zst gsoc2013-evolution-12b2cfb7410fb091fde463332454dc8fce4f91c9.zip | |
New function to migrate the imap cache. (em_migrate_1_4): Migrate the IMAP
2004-01-20 Jeffrey Stedfast <fejj@ximian.com>
* em-migrate.c (em_migrate_imap_caches_1_4): New function to
migrate the imap cache.
(em_migrate_1_4): Migrate the IMAP cache. Fixes bug #52985.
(em_migrate_1_4): Copy over the searches.xml file. Fixes bug
#52980.
svn path=/trunk/; revision=24332
| -rw-r--r-- | mail/ChangeLog | 2 | ||||
| -rw-r--r-- | mail/em-migrate.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index cfe04b165a..c005e24e63 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -3,6 +3,8 @@ * em-migrate.c (em_migrate_imap_caches_1_4): New function to migrate the imap cache. (em_migrate_1_4): Migrate the IMAP cache. Fixes bug #52985. + (em_migrate_1_4): Copy over the searches.xml file. Fixes bug + #52980. * mail-session.c (request_password): Changed the logic of the visibility of the passwd text so that we hid ethe passwd if the diff --git a/mail/em-migrate.c b/mail/em-migrate.c index b925059bc9..2ac818f3a0 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1878,6 +1878,16 @@ em_migrate_1_4 (const char *evolution_dir, xmlDocPtr filters, xmlDocPtr vfolders if (em_upgrade_xml_1_4 (vfolders) == -1) return -1; + path = g_build_filename (g_get_home_dir (), "evolution", "searches.xml", NULL); + if (stat (path, &st) == 0 && S_ISREG (st.st_mode)) { + char *dest; + + dest = g_build_filename (evolution_dir, "mail", "searches.xml", NULL); + cp (path, dest); + g_free (dest); + } + g_free (path); + if (em_migrate_pop_uid_caches_1_4 (evolution_dir, ex) == -1) return -1; |