aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/exchange-operations/ChangeLog8
-rw-r--r--plugins/exchange-operations/exchange-calendar.c5
-rw-r--r--plugins/exchange-operations/exchange-contacts.c4
3 files changed, 16 insertions, 1 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 524f9be733..7ebe8ec037 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,5 +1,13 @@
2006-02-27 Sushma Rai <rsushma@novell.com>
+ * exchange-contacts.c (e_exchange_contacts_pcontacts): Check for NULL
+ account.
+
+ * exchange-calendar.c (e_exchange_calendar_pcalendar): Similar.
+ Fixes #332185.
+
+2006-02-27 Sushma Rai <rsushma@novell.com>
+
* exchange-folder-permission.c
(org_gnome_exchange_calendar_permissions): Trying to get the exchange
account only if one tries to see the folder permissions for the
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index e316dc2421..c6291cfb5a 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -159,7 +159,6 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
char *offline_msg;
GtkWidget *lbl_offline_msg;
-
if (!hidden)
hidden = gtk_label_new ("");
@@ -212,6 +211,10 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
/* REVIEW: Should this handle be freed? - Attn: surf */
account = exchange_operations_get_exchange_account ();
+ if (!account) {
+ g_free (calendar_old_source_uri);
+ retrun NULL;
+ }
account_name = account->account_name;
if (calendar_src_exists) {
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 67c1d07476..506522038d 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -192,6 +192,10 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
}
account = exchange_operations_get_exchange_account ();
+ if (!account) {
+ g_free (contacts_old_src_uri);
+ return NULL;
+ }
account_name = account->account_name;
hbx_size = NULL;