From 6cf6c0cada7a95853daa122032dbee3a823c4953 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 8 Oct 2008 18:22:50 +0000 Subject: ** Fix for bug #530606 2008-10-08 Milan Crha ** Fix for bug #530606 * exchange-contacts.c: (e_exchange_contacts_get_contacts), (e_exchange_contacts_pcontacts_on_change), (e_exchange_contacts_pcontacts), (e_exchange_contacts_check), (e_exchange_contacts_commit): * exchange-account-setup.c: (btn_chpass_clicked), (btn_dass_clicked), (btn_fsize_clicked), (org_gnome_exchange_show_folder_size_factory): * exchange-calendar.c: (e_exchange_calendar_get_calendars), (e_exchange_calendar_pcalendar_on_change), (e_exchange_calendar_pcalendar), (e_exchange_calendar_check), (e_exchange_calendar_commit): Check validity of returned pointer before using it. svn path=/trunk/; revision=36579 --- plugins/exchange-operations/exchange-account-setup.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'plugins/exchange-operations/exchange-account-setup.c') diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index f4f4900dec..275a214b90 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -123,6 +123,8 @@ btn_chpass_clicked (GtkButton *button, gpointer data) ExchangeAccountResult result; account = exchange_operations_get_exchange_account (); + if (!account) + return; old_password = exchange_account_get_password (account); if (!old_password) { @@ -149,6 +151,8 @@ btn_dass_clicked (GtkButton *button, gpointer data) { ExchangeAccount *account; account = exchange_operations_get_exchange_account (); + if (!account) + return; exchange_delegates (account, gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW)); } @@ -159,6 +163,8 @@ btn_fsize_clicked (GtkButton *button, gpointer data) GtkListStore *model; account = exchange_operations_get_exchange_account (); + if (!account) + return; model = exchange_account_folder_size_get_model (account); if (model) @@ -1050,7 +1056,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor if (g_ascii_strcasecmp (provider->protocol, "exchange")) return NULL; - account = exchange_operations_get_exchange_account (); + account = exchange_operations_get_exchange_account (); + if (!account) + return NULL; + exchange_account_is_offline (account, &mode); if (mode == OFFLINE_MODE) return NULL; -- cgit v1.2.3