diff options
| author | Seth Alves <alves@src.gnome.org> | 2000-04-26 01:42:55 +0800 |
|---|---|---|
| committer | Seth Alves <alves@src.gnome.org> | 2000-04-26 01:42:55 +0800 |
| commit | 8bedc01ea38621443178dececadeefa639ece958 (patch) | |
| tree | 624f633dc58440f3d641d0f234aa3be817d291de | |
| parent | e8bff6c44ec77124c393259f84bdf73737e0e7c7 (diff) | |
| download | gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar.gz gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar.bz2 gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar.lz gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar.xz gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.tar.zst gsoc2013-evolution-8bedc01ea38621443178dececadeefa639ece958.zip | |
allow for null ico
* gui/e-day-view.c (e_day_view_update_event): allow for null ico
* gui/e-week-view.c (e_week_view_update_event): allow for null ico
svn path=/trunk/; revision=2605
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/evolution-calendar-control.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 3f6b67d465..d0a736019b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2000-04-25 Seth Alves <alves@hungry.com> + + * gui/e-day-view.c (e_day_view_update_event): allow for null ico + + * gui/e-week-view.c (e_week_view_update_event): allow for null ico + 2000-04-24 Federico Mena Quintero <federico@helixcode.com> * cal-client/client-test.c (main): The path to the test calendar diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 2ec44e2ac6..e47cbed34b 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1080,7 +1080,7 @@ e_day_view_update_event (EDayView *day_view, return; /* If one non-recurring event was added, we can just add it. */ - if (flags == CHANGE_NEW && !ico->recur) { + if (flags == CHANGE_NEW && ico && !ico->recur) { if (ico->dtstart < day_view->upper && ico->dtend > day_view->lower) { e_day_view_add_event (ico, ico->dtstart, ico->dtend, diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 28ca5ed396..51a292041e 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -926,7 +926,7 @@ e_week_view_update_event (EWeekView *week_view, return; /* If one non-recurring event was added, we can just add it. */ - if (flags == CHANGE_NEW && !ico->recur) { + if (flags == CHANGE_NEW && ico && !ico->recur) { num_days = week_view->display_month ? E_WEEK_VIEW_MAX_WEEKS * 7 : 7; if (ico->dtstart < week_view->day_starts[num_days] diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c index 721a5e871c..c8c419d471 100644 --- a/calendar/gui/evolution-calendar-control.c +++ b/calendar/gui/evolution-calendar-control.c @@ -160,7 +160,7 @@ main (int argc, char **argv) alarm_init (); init_calendar (); - g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF); + //g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF); CORBA_exception_init (&ev); |