aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/exchange-operations/ChangeLog8
-rw-r--r--plugins/exchange-operations/exchange-account-setup.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index c54804ec9c..351fcbc7fe 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-15 Sushma Rai <rsushma@novell.com>
+
+ * exchange-account-setup.c (org_gnome_exchange_settings): Trying to
+ get the exchange account, after checking the account selected in
+ an exchange account or not. It fixes a crash, when trying to edit an
+ non-exchange account, where e-d-s and evolution are built with exchange
+ support, but exchange account is not configured.
+
2005-06-14 Sarfaaz Ahmed <asarfraaz@novell.com>
* exchange-account-setup.c : Fixed some warnings
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 0aadf230a9..06dc3fbb63 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -215,8 +215,6 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
GtkTextBuffer *buffer;
GtkTextIter start, end;
- account = exchange_operations_get_exchange_account ();
-
target_account = (EMConfigTargetAccount *)data->config->target;
source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
url = camel_url_new(source_url, NULL);
@@ -232,6 +230,8 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
return data->old;
}
+ account = exchange_operations_get_exchange_account ();
+
oof_data = g_new0 (OOFData, 1);
oof_data->state = FALSE;