aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-calendar-table.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 82cdf047ef..18827fca92 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-17 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #530872
+
+ * gui/e-calendar-table.c: (e_calendar_table_on_open_task):
+ Check for NULL soon enough to not crash.
+
2008-10-14 Sankar P <psankar@novell.com>
License Changes
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index fc8364457f..c72dfe110a 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1327,9 +1327,12 @@ e_calendar_table_on_open_task (EPopup *ep, EPopupItem *pitem, void *data)
icalproperty *prop;
comp_data = e_calendar_table_get_selected_comp (cal_table);
+
+ if (!comp_data)
+ return;
+
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY);
- if (comp_data)
- e_calendar_table_open_task (cal_table, comp_data->client, comp_data->icalcomp, prop ? TRUE : FALSE);
+ e_calendar_table_open_task (cal_table, comp_data->client, comp_data->icalcomp, prop ? TRUE : FALSE);
}
static void