Do not set the time popup range. We also want to be able to create

2001-08-16  Federico Mena Quintero  <federico@ximian.com>

	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
	Do not set the time popup range.  We also want to be able to
	create appointments that are not within nine-to-five!  Think of
	going to the movies!  Fixes bug #7436.

	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
	Fixes bug #7367.

svn path=/trunk/; revision=12109

3 files changed, 14 insertions, 12 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a1af106e76..9402083d04 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-16  Federico Mena Quintero  <federico@ximian.com>
+
+	* gui/calendar-config.c (calendar_config_configure_e_date_edit):
+	Do not set the time popup range.  We also want to be able to
+	create appointments that are not within nine-to-five!  Think of
+	going to the movies!  Fixes bug #7436.
+
+	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".
+	Fixes bug #7367.
+
 2001-08-16  Jon Trowbridge  <trow@ximian.com>
 
 	* gui/cal-search-bar.c: Changed to reflect my renaming of some of
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 9b6d005259..c1c3f89870 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -554,14 +554,13 @@ calendar_config_configure_e_calendar	(ECalendar	*cal)
 
 
 /* This sets all the common config settings for an EDateEdit widget.
-   These are the week start day, whether we show week numbers, whether we
-   use 24 hour format, and the hours of the working day to use in the time
-   popup. */
+   These are the week start day, whether we show week numbers, and whether we
+   use 24 hour format. */
 void
 calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
 {
 	gboolean dnav_show_week_no, use_24_hour;
-	gint week_start_day, start_hour, end_hour;
+	gint week_start_day;
 
 	g_return_if_fail (E_IS_DATE_EDIT (dedit));
 
@@ -575,16 +574,9 @@ calendar_config_configure_e_date_edit	(EDateEdit	*dedit)
 
 	use_24_hour = calendar_config_get_24_hour_format ();
 
-	start_hour = calendar_config_get_day_start_hour ();
-	end_hour = calendar_config_get_day_end_hour ();
-	/* Round up the end hour. */
-	if (calendar_config_get_day_end_minute () != 0)
-		end_hour = end_hour + 1 % 24;
-
 	e_date_edit_set_week_start_day (dedit, week_start_day);
 	e_date_edit_set_show_week_numbers (dedit, dnav_show_week_no);
 	e_date_edit_set_use_24_hour_format (dedit, use_24_hour);
-	e_date_edit_set_time_popup_range (dedit, start_hour, end_hour);
 }
 
 
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
index dc4d4481cb..6290db63dd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade
@@ -232,7 +232,7 @@
 		<class>GtkRadioButton</class>
 		<name>use_12_hour</name>
 		<can_focus>True</can_focus>
-		<label>_12 hour (am/pm)</label>
+		<label>_12 hour (AM/PM)</label>
 		<active>False</active>
 		<draw_indicator>True</draw_indicator>
 		<group>time_format_group</group>