diff options
| -rw-r--r-- | mail/ChangeLog | 3 | ||||
| -rw-r--r-- | mail/evolution-mbox-upgrade.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 1c746f2996..11c7519767 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,8 @@ 2003-09-23 Jeffrey Stedfast <fejj@ximian.com> + * evolution-mbox-upgrade.c (get_local_store): Don't xmlFree (name) + until after we've g_strdup'd it. + Fix for bug #48791 (and also fixes a FIXME) * em-format.c (emf_init): Setup a gconf listener for changes to diff --git a/mail/evolution-mbox-upgrade.c b/mail/evolution-mbox-upgrade.c index bd5b855782..92a2844034 100644 --- a/mail/evolution-mbox-upgrade.c +++ b/mail/evolution-mbox-upgrade.c @@ -194,8 +194,6 @@ get_local_store (CamelSession *session, const char *dirname, const char *metadat buf = g_strdup_printf ("%s:%s", protocol, dirname); xmlFree (protocol); - xmlFree (name); - if ((store = camel_session_get_store (session, buf, ex))) *namep = g_strdup (name); else @@ -259,6 +257,8 @@ em_migrate_dir (EMMigrateSession *session, const char *dirname, const char *full return; } + g_free (name); + flags |= (index ? CAMEL_STORE_FOLDER_BODY_INDEX : 0); if (!(new_folder = camel_store_get_folder (session->store, full_name, flags, &ex))) { g_warning ("error creating new mbox folder `%s': %s", full_name, ex.desc); |