[evolution] Fix a runtime warning on calendar startup.



commit 492f7668e553b13ce98d16f5badc8032e7c148fd
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri May 28 11:05:26 2010 -0400

    Fix a runtime warning on calendar startup.

 calendar/gui/e-calendar-view.c |    4 +++-
 calendar/gui/gnome-cal.c       |    9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 77d8fd2..57a96d8 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1166,8 +1166,10 @@ e_calendar_view_set_selected_time_range (ECalendarView *cal_view,
 
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
+	/* Not all views implement this, so return silently. */
 	class = E_CALENDAR_VIEW_GET_CLASS (cal_view);
-	g_return_if_fail (class->set_selected_time_range != NULL);
+	if (class->set_selected_time_range == NULL)
+		return;
 
 	class->set_selected_time_range (cal_view, start_time, end_time);
 }
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index a24dfa2..2f2bb48 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -484,7 +484,7 @@ gnome_calendar_constructed (GObject *object)
 		model, "notify::week-start-day",
 		G_CALLBACK (gnome_calendar_notify_week_start_day_cb), gcal);
 
-	gnome_calendar_update_time_range (gcal);
+	gnome_calendar_goto_today (gcal);
 }
 
 /* Class initialization function for the gnome calendar */
@@ -1615,10 +1615,9 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
 
 	gnome_calendar_set_selected_time_range (gcal, new_time);
 
-	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-		if (E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (priv->views[i]))->set_selected_time_range)
-			E_CALENDAR_VIEW_CLASS (G_OBJECT_GET_CLASS (priv->views[i]))->set_selected_time_range (priv->views[i], new_time, new_time);
-	}
+	for (i = 0; i < GNOME_CAL_LAST_VIEW; i++)
+		e_calendar_view_set_selected_time_range (
+			priv->views[i], new_time, new_time);
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]