aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/e-day-view-time-item.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a91d7d2819..d6d220b0e4 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-11 Damon Chaplin <damon@helixcode.com>
+
+ * gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
+ hour format the wrong way round.
+
2000-10-12 JP Rosevear <jpr@helixcode.com>
* conduits/calendar/calendar-conduit.c (comp_from_remote_record):
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 219f61d10f..19d8d40317 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -262,7 +262,7 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
}
hour = day_view->first_hour_shown;
- if (day_view->use_24_hour_format) {
+ if (!day_view->use_24_hour_format) {
if (hour == 0 || hour == 12)
hour = 12;
else
@@ -323,7 +323,7 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
minute += day_view->mins_per_row;
if (minute >= 60) {
hour++;
- if (day_view->use_24_hour_format) {
+ if (!day_view->use_24_hour_format) {
if (hour == 0 || hour == 12)
hour = 12;
else