diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-table.c | 10 |
3 files changed, 6 insertions, 11 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index faaf240722..a8953c347b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2004-04-21 JP Rosevear <jpr@ximian.com> + + * gui/calendar-component.c (create_new_event): make sure we don't + deref a NULL pointer + 2004-04-21 JP Rosevear <jpr@ximian.com> Fixes #56504 diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 7e04ac4a95..e7b4830b94 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -839,7 +839,7 @@ create_new_event (CalendarComponent *calendar_component, CalendarComponentView * return TRUE; } - if (component_view->calendar && (view = E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (component_view->calendar)))) { + if (component_view && (view = E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (component_view->calendar)))) { GnomeCalendarViewType view_type; /* Force all for these view types because thats what's selected and it mimics a double click */ diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index ac79a1b262..d224b21d12 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -131,16 +131,6 @@ e_calendar_table_class_init (ECalendarTableClass *class) /* Method override */ object_class->destroy = e_calendar_table_destroy; -#if 0 - widget_class->realize = e_calendar_table_realize; - widget_class->unrealize = e_calendar_table_unrealize; - widget_class->style_set = e_calendar_table_style_set; - widget_class->size_allocate = e_calendar_table_size_allocate; - widget_class->focus_in_event = e_calendar_table_focus_in; - widget_class->focus_out_event = e_calendar_table_focus_out; - widget_class->key_press_event = e_calendar_table_key_press; -#endif - /* clipboard atom */ if (!clipboard_atom) clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE); |