remove extra set view params (gnome_calendar_set_view): simplify, just set

2004-04-07  JP Rosevear <jpr@ximian.com>

	* gui/gnome-cal.c (gnome_calendar_dayjump): remove extra set view
	params
	(gnome_calendar_set_view): simplify, just set the current view id
	and let the gal view stuff do the rest
	(display_view): modify from set_view, don't set the view id here
	or update the default view config setting
	(display_view_cb): update the date navigator
	(gnome_calendar_construct): kill the default view stuff, gal view
	handles that
	(gnome_calendar_on_date_navigator_selection_changed): use display_view

	* gui/e-week-view.c (time_range_changed_cb): ditto
	(e_week_view_set_selected_time_range): just set the selection,
	don't fool with the base date
	(e_week_view_on_button_press): do a full day event if double
	clicked on

	* gui/e-day-view.c (time_range_changed_cb): only set the selection
	if we can't preserve an existing selection

	* gui/control-factory.c (set_prop):

	* gui/calendar-config.h: remove protos

	* gui/calendar-config.c: remove default view calls

	* gui/calendar-commands.c (show_day_view_clicked): remove extra
	params to gnome_calendar_set_view
	(show_work_week_view_clicked): ditto
	(show_week_view_clicked): ditto
	(show_month_view_clicked): ditto
	(show_list_view_clicked): ditto

	* gui/apps_evolution_calendar.schemas.in.in: remove default view
	setting, gal view remembers this for us

svn path=/trunk/; revision=25353

1 files changed, 3 insertions, 1 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index f79f1d9ddd..bc256e288b 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -507,7 +507,9 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
 	if (lower != day_view->lower)
 		e_day_view_recalc_day_starts (day_view, lower);
 
-	e_day_view_set_selected_time_range (E_CALENDAR_VIEW (day_view), start_time, end_time);
+	/* If we don't show the new selection, don't preserve it */
+	if (day_view->selection_start_day == -1 || day_view->days_shown <= day_view->selection_start_day)
+		e_day_view_set_selected_time_range (E_CALENDAR_VIEW (day_view), start_time, end_time);
 }