[evolution/webkit] Bug #602183 (bnc) - Crash in Mini Calendar View

[Dan VrÃtil <dvratil src gnome org>]

commit 94084ae39b25e7dff57f6d5282c21ac6d06dd519
Author: Vibha Yadav <yvibha novell com>
Date:   Wed Dec 1 17:24:46 2010 +0530

    Bug #602183 (bnc) - Crash in Mini Calendar View
    
    Calendar view crashes on updating the scroll bar of newly created
    layout for events. Hence tries to access the event's canvas which
    is not yet drawn.
    
    Hence calling scroll bar update after drawing long events.

 calendar/gui/e-day-view.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f81afae..ea2b13c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4633,17 +4633,18 @@ e_day_view_check_layout (EDayView *day_view)
 					       day_view->days_shown,
 					       day_view->day_starts,
 					       &rows_in_top_display);
-
-		if (day_view->rows_in_top_display != rows_in_top_display) {
-			day_view->rows_in_top_display = rows_in_top_display;
-			e_day_view_update_top_scroll (day_view, FALSE);
-		}
 	}
 
 	if (day_view->long_events_need_layout
 	    || day_view->long_events_need_reshape)
 		e_day_view_reshape_long_events (day_view);
 
+	if (day_view->long_events_need_layout 
+			&& day_view->rows_in_top_display != rows_in_top_display) {
+		day_view->rows_in_top_display = rows_in_top_display;
+		e_day_view_update_top_scroll (day_view, FALSE);
+	}
+
 	day_view->long_events_need_layout = FALSE;
 	day_view->long_events_need_reshape = FALSE;