aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/upgrade-mailer.c10
2 files changed, 15 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f953169b63..ad9fbc233c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-21 Dan Winship <danw@ximian.com>
+
+ * upgrade-mailer.c (mailer_upgrade): Fix the transport URL on any
+ Exchange accounts. Fixes #30209, which is to say that it fixes
+ #28490 correctly.
+
2002-10-17 Jeffrey Stedfast <fejj@ximian.com>
* mail-tools.c (mail_tool_quote_message): Strip the signature from
diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c
index a9c122b9d3..2efb32c6a1 100644
--- a/mail/upgrade-mailer.c
+++ b/mail/upgrade-mailer.c
@@ -957,7 +957,7 @@ mailer_upgrade (Bonobo_ConfigDatabase db)
{
GHashTable *imap_sources, *accounts;
char *path, *uri;
- char *account;
+ char *account, *transport;
int num, i;
if ((num = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL)) == 0) {
@@ -1024,6 +1024,14 @@ mailer_upgrade (Bonobo_ConfigDatabase db)
if (account)
g_hash_table_insert (accounts, account, si);
} else if (uri && !strncmp (uri, "exchange:", 9)) {
+ /* Upgrade transport uri */
+ path = g_strdup_printf ("/Mail/Accounts/transport_url_%d", i);
+ transport = bonobo_config_get_string (db, path, NULL);
+ if (transport && !strncmp (transport, "exchanget:", 10))
+ bonobo_config_set_string (db, path, uri, NULL);
+ g_free (transport);
+ g_free (path);
+
path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);
account = bonobo_config_get_string (db, path, NULL);
g_free (path);