fixed typo in menu item label.

2003-10-29  Rodrigo Moya <rodrigo@ximian.com>

	* gui/calendar-component.c (fill_popup_menu_callback): fixed
	typo in menu item label.

	* gui/e-cal-model.[ch] (e_cal_model_get_use_24_hour_format): new
	function.

	* gui/e-cal-view.[ch]: no need to keep the 'use_24_hour' setting,
	it's already in the model.
	(e_cal_view_get_use_24_hour_format,
	e_cal_view_set_use_24_hour_format): new functions.

	* gui/e-day-view.[ch] (e_day_view_get_24_hour_format,
	(e_day_view_set_24_hour_format): removed.
	(e_day_view_convert_time_to_display, e_day_view_update_event_label,
	e_day_view_get_time_string_width): use the ECalView's function to
	get the 24 hour format.

	* gui/e-week-view.[ch] (e_week_view_get_24_hour_format,
	e_week_view_set_24_hour_format): removed.
	(e_week_view_convert_time_to_display,
	e_week_view_get_time_string_width): use the ECalView's function
	to get the 24 hour format.

	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):
	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
	* gui/e-week-view-event-item.c (e_week_view_draw_time):
	don't use the view's use_24_hour_format, but the ECalView method.

svn path=/trunk/; revision=23113

1 files changed, 2 insertions, 32 deletions

diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 4a042f36e3..df1f01c5fc 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -1705,36 +1705,6 @@ e_week_view_set_week_start_day	(EWeekView	*week_view,
 						 &week_view->first_day_shown);
 }
 
-
-/* Whether we use 12-hour or 24-hour format. */
-gboolean
-e_week_view_get_24_hour_format	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->use_24_hour_format;
-}
-
-
-void
-e_week_view_set_24_hour_format	(EWeekView	*week_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->use_24_hour_format == use_24_hour)
-		return;
-
-	week_view->use_24_hour_format = use_24_hour;
-
-	/* We need to re-layout the events since the time format affects the
-	   sizes. */
-	e_week_view_recalc_cell_sizes (week_view);
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
 static gboolean
 e_week_view_recalc_display_start_day	(EWeekView	*week_view)
 {
@@ -3614,7 +3584,7 @@ e_week_view_convert_time_to_display	(EWeekView	*week_view,
 	/* Calculate the actual hour number to display. For 12-hour
 	   format we convert 0-23 to 12-11am/12-11pm. */
 	*display_hour = hour;
-	if (week_view->use_24_hour_format) {
+	if (e_cal_view_get_use_24_hour_format (E_CAL_VIEW (week_view))) {
 		*suffix = "";
 		*suffix_width = 0;
 	} else {
@@ -3646,7 +3616,7 @@ e_week_view_get_time_string_width	(EWeekView	*week_view)
 		time_width = week_view->digit_width * 4
 			+ week_view->colon_width;
 
-	if (!week_view->use_24_hour_format)
+	if (!e_cal_view_get_use_24_hour_format (E_CAL_VIEW (week_view)))
 		time_width += MAX (week_view->am_string_width,
 				   week_view->pm_string_width);